Attachment #57182 for bug #86303

View | Details | Raw Unified | Return to bug 86303
Collapse All | Expand All




#  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 the xml tools
# define:
#  WITHOUT_MUTT_XML
#    (this can only be stated if WITHOUT_MUTT_HTML is defined)
#
# If you want to access compressed email folders define:

#

PORTNAME=	mutt-devel
PORTVERSION=	1.5.11
CATEGORIES+=	mail ipv6
.if defined(WITH_MUTT_NNTP)
CATEGORIES+=	news

		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}
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}


.endif

.if defined (MUTT_LITE)
WITHOUT_MUTT_XML=			yes
WITHOUT_MUTT_COMPRESSED_FOLDERS=	yes
WITHOUT_MUTT_QUOTE_PATCH=		yes
WITHOUT_MUTT_HTML=			yes

MUTT_USES_SLANG=	yes
.endif
.if defined(WITHOUT_MUTT_SGMLFORMAT)
XML_USED=	no
.endif
.if defined(WITHOUT_MUTT_XML)
XML_USED=	no
.endif
.if !defined(XML_USED)
XML_USED=	no
.endif
.if !defined(WITHOUT_NLS)
USE_GETTEXT=	yes

USE_ICONV=	yes
.endif
.if defined(NOPORTDOCS)
XML_USED=	no
.endif
.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses

.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
DISTFILES+=	patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
CONFIGURE_ARGS+=	--enable-compressed
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' \

.if defined(WITH_MUTT_NNTP)
DISTFILES+=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
CONFIGURE_ARGS+=	--enable-nntp
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' \

.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
PATCHFILES+=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
		patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
XML_NEEDED=	yes
.endif
.if defined(WITH_MUTT_SIGNATURE_MENU)
PATCHFILES+=	patch-${CD_PATCH_VERSION}.cd.signatures_menu.2.1:cd
XML_NEEDED=	yes
.endif
.if defined(WITH_MUTT_IFDEF_PATCH)
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

.if defined(WITH_MUTT_SIDEBAR_PATCH)
SIDEBAR_PATCH=	patch-1.5.10i.sidebar.20050816.txt
DISTFILES+=	${SIDEBAR_PATCH}:thomer
XML_NEEDED=	yes
pre-patch::
	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/${SIDEBAR_PATCH} > ${WRKDIR}/patch-sidebar
	@${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \

		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
		${WRKSRC}/doc/muttrc.man
.if ! defined(WITHOUT_MUTT_HTML)
XML_USED=	yes
.endif
.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 ${XML_USED} == yes
#BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
#		lynx:${PORTSDIR}/www/lynx
post-patch::
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-xml
.endif

pre-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




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

Line 0 Link Here

(-)./files/extra-patch-doc-xml (+11 lines)
	1	--- doc/Makefile.in.orig2 Sat Feb 2 18:30:27 2002
	2	+++ doc/Makefile.in Sat Feb 2 18:32:39 2002
	3	@@ -60,7 +60,7 @@
	4	topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \
	5	README NEWS TODO README.SECURITY README.SSL
	6
	7	-all: mutt.1 muttrc.man
	8	+all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
	9
	10	try-html: ../makedoc
	11	rm -f .html && $(MAKE) manual.html \|\| cp $(srcdir)/manual.html ./




 
 bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
 
--- 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

-	for f in $(srcdir_DOCFILES) ; do \
-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
-	done
-	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
 
 uninstall:
 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \

Lines 1-11 Link Here

(-)./files/extra-patch-sgmlformat (-11 lines)
1	--- doc/Makefile.in.orig2 Sat Feb 2 18:30:27 2002
2	+++ doc/Makefile.in Sat Feb 2 18:32:39 2002
3	@@ -60,7 +60,7 @@
4	topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \
5	README NEWS TODO README.SECURITY README.SSL
6
7	-all: mutt.1
8	+all: mutt.1 muttrc.man try-html try-txt try-latin1 try-ps
9
10	try-html: ../makedoc
11	rm -f .html && $(MAKE) manual.html \|\| cp $(srcdir)/manual.html ./




--- 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 manual.html stamp-doc-chunked manual.txt
+all: mutt.1 muttrc.man
 
 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 $@
 
 install: all instdoc
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
@@ -89,9 +89,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) ; \
-		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
-	done
 
 uninstall:
 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
@@ -108,13 +105,13 @@
 
 check:
 manual.txt: manual.html
-	-lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
+#	-lynx -dump -nolist -with_backspaces manual.html > $@
 
 manual.html: $(srcdir)/html.xsl manual.xml
-	-xsltproc --nonet -o $@ $^
+#	-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
 
 manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
-	-xsltproc --nonet $^
+#	-xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
 	touch stamp-doc-chunked
+	sgmlfmt -f html manual || true
+
+manual.latin1: manual.sgml
+	sgmlfmt -f latin1 manual || true
 
 manual.ps: manual.sgml
-	sgml2latex --output=ps manual || true
+	sgmlfmt -f ps manual || true
 
 manual.pdf: stamp-doc-tex
 	rm -f *~ *.html *.orig *.rej  stamp-doc-sgml stamp-doc-man *.ps




--- 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




--- 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

Lines 1-11 Link Here

(-)./files/patch-doc-mutt.1 (-11 lines)
1	--- doc/Makefile.in.orig Sun Aug 14 11:27:21 2005
2	+++ doc/Makefile.in Sun Aug 14 11:28:38 2005
3	@@ -179,7 +179,7 @@
4	-e 's,@docdir\@,$(docdir),g'
5
6	mutt.1: $(srcdir)/mutt.man
7	- $(EDIT) $< > $@
8	+ $(EDIT) $(srcdir)/mutt.man > $@
9
10	muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
11	$(MAKEDOC_CPP) $(top_srcdir)/init.h \| ../makedoc -m \| \




--- 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.




 
 into your system's global Muttrc, which normally resides in /etc or
 /usr/local/etc.
--- 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)
 
 6.3.160. pgp_getkeys_command
 
@@ -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)
 
 6.3.179. smime_verify_command
 




--- 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);
       }
       
       /*




+++ 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

     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 @@

 
   /* actions for mutt_pattern_comp/mutt_pattern_exec */
   M_AND,
--- pattern.c.orig2	Sun Sep 18 15:17:46 2005
+++ pattern.c	Sun Sep 18 15:19:48 2005
@@ -54,6 +54,7 @@
 }
 Flags[] =
 {

   { 'A', M_ALL,			0,		NULL },
   { 'b', M_BODY,		M_FULL_MSG,	eat_regexp },
   { 'B', M_WHOLE_MSG,		M_FULL_MSG,	eat_regexp },
@@ -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;

+        }
+        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:




  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
    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
    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/manual.html" >> $tmp_first
    echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first
    echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first
    echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first
      echo "%%DOCSDIR%%/html/manual$i.html" >> $tmp_first 
      i=$(($i + 1))
    done
    echo "@dirrm %%DOCSDIR%%/html" >> $tmp_last
  fi
  cat >> $tmp_last <<EOF

Return to bug 86303

Lines 120-163 Link Here

(-)./scripts/generate-plist (-35 / +7 lines)
120	if [ "$MUTT_NNTP" = "yes" ]; then	120	if [ "$MUTT_NNTP" = "yes" ]; then
121	echo "%%DOCSDIR%%/ChangeLog.nntp" >> $tmp_first	121	echo "%%DOCSDIR%%/ChangeLog.nntp" >> $tmp_first
122	fi	122	fi
123	if [ "$MUTT_SGML" = "yes" ]; then
124	echo "%%DOCSDIR%%/manual.latin1" >> $tmp_first
125	echo "%%DOCSDIR%%/manual.ps" >> $tmp_first
126	fi
127		123
128	if [ "$MUTT_HTML" = "yes" ]; then	124	if [ "$MUTT_HTML" = "yes" ]; then
129	html=395	125	echo "%%DOCSDIR%%/html/advancedusage.html" >> $tmp_first
130	if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then	126	echo "%%DOCSDIR%%/html/configuration.html" >> $tmp_first
131	html=$(($html + 5))	127	echo "%%DOCSDIR%%/html/gettingstarted.html" >> $tmp_first
132	fi	128	echo "%%DOCSDIR%%/html/index.html" >> $tmp_first
133	if [ "$MUTT_NNTP" = "yes" ]; then
134	html=$(($html + 22))
135	fi
136	if [ "$MUTT_QUOTE_PATCH" = "yes" ]; then
137	html=$(($html + 2))
138	fi
139	if [ "$MUTT_SIDEBAR_PATCH" = "yes" ]; then
140	html=$(($html + 2))
141	fi
142	if [ "$MUTT_SIGNATURE_MENU" = "yes" ]; then
143	html=$(($html + 1))
144	fi
145	if [ "$MUTT_IFDEF_PATCH" = "yes" ]; then
146	html=$(($html + 1))
147	fi
148	if [ "$MUTT_REVERSE_REPLY_PATCH" = "yes" ]; then
149	html=$(($html + 1))
150	fi
151	if [ "$MUTT_SLAVE_HTML_PAGES" != "" ]; then
152	html=$(($html + $MUTT_SLAVE_HTML_PAGES))
153	fi
154	echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first	129	echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first
155	echo "%%DOCSDIR%%/html/manual_toc.html" >> $tmp_first	130	echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first
156	i=1	131	echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first
157	while [ $i -le $html ]; do	132	echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first
158	echo "%%DOCSDIR%%/html/manual$i.html" >> $tmp_first
159	i=$(($i + 1))
160	done
161	echo "@dirrm %%DOCSDIR%%/html" >> $tmp_last	133	echo "@dirrm %%DOCSDIR%%/html" >> $tmp_last
162	fi	134	fi
163	cat >> $tmp_last <<EOF	135	cat >> $tmp_last <<EOF

Lines 28-36 Link Here

(-)./Makefile (-26 / +32 lines)
28	# WITH_MUTT_HTML	28	# WITH_MUTT_HTML
29	# This is a default knob and can be disabled by WITHOUT_MUTT_HTML	29	# This is a default knob and can be disabled by WITHOUT_MUTT_HTML
30	#	30	#
31	# If you do not want that the documentation is rebuilt using sgmlformat	31	# If you do not want that the documentation is rebuilt using the xml tools
32	# define:	32	# define:
33	# WITHOUT_MUTT_SGMLFORMAT	33	# WITHOUT_MUTT_XML
34	# (this can only be stated if WITHOUT_MUTT_HTML is defined)	34	# (this can only be stated if WITHOUT_MUTT_HTML is defined)
35	#	35	#
36	# If you want to access compressed email folders define:	36	# If you want to access compressed email folders define:
Lines 95-101 Link Here
95	#	95	#
96		96
97	PORTNAME= mutt-devel	97	PORTNAME= mutt-devel
98	PORTVERSION= 1.5.10	98	PORTVERSION= 1.5.11
99	CATEGORIES+= mail ipv6	99	CATEGORIES+= mail ipv6
100	.if defined(WITH_MUTT_NNTP)	100	.if defined(WITH_MUTT_NNTP)
101	CATEGORIES+= news	101	CATEGORIES+= news
Lines 110-117 Link Here
110	ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \	110	ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
111	ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \	111	ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
112	http://www.spinnaker.de/mutt/compressed/:rr \	112	http://www.spinnaker.de/mutt/compressed/:rr \
		113	http://cedricduval.free.fr/mutt/patches/download/:cd \
113	http://thomer.com/mutt/:thomer	114	http://thomer.com/mutt/:thomer
114	DISTNAME= mutt-${PORTVERSION}i	115	DISTNAME= mutt-${PORTVERSION}
115	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	116	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
116	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}	117	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
117		118
Lines 190-196 Link Here
190	.endif	191	.endif
191		192
192	.if defined (MUTT_LITE)	193	.if defined (MUTT_LITE)
193	WITHOUT_MUTT_SGMLFORMAT= yes	194	WITHOUT_MUTT_XML= yes
194	WITHOUT_MUTT_COMPRESSED_FOLDERS= yes	195	WITHOUT_MUTT_COMPRESSED_FOLDERS= yes
195	WITHOUT_MUTT_QUOTE_PATCH= yes	196	WITHOUT_MUTT_QUOTE_PATCH= yes
196	WITHOUT_MUTT_HTML= yes	197	WITHOUT_MUTT_HTML= yes
Lines 244-253 Link Here
244	MUTT_USES_SLANG= yes	245	MUTT_USES_SLANG= yes
245	.endif	246	.endif
246	.if defined(WITHOUT_MUTT_SGMLFORMAT)	247	.if defined(WITHOUT_MUTT_SGMLFORMAT)
247	SGML_USED= no	248	XML_USED= no
		249	.endif
		250	.if defined(WITHOUT_MUTT_XML)
		251	XML_USED= no
248	.endif	252	.endif
249	.if !defined(SGML_USED)	253	.if !defined(XML_USED)
250	SGML_USED= no	254	XML_USED= no
251	.endif	255	.endif
252	.if !defined(WITHOUT_NLS)	256	.if !defined(WITHOUT_NLS)
253	USE_GETTEXT= yes	257	USE_GETTEXT= yes
Lines 256-262 Link Here
256	USE_ICONV= yes	260	USE_ICONV= yes
257	.endif	261	.endif
258	.if defined(NOPORTDOCS)	262	.if defined(NOPORTDOCS)
259	SGML_USED= no	263	XML_USED= no
260	.endif	264	.endif
261	.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000	265	.if defined(MUTT_USES_NCURSES) && ${OSVERSION} < 400000
262	LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses	266	LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
Lines 344-350 Link Here
344	.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)	348	.if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
345	DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv	349	DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
346	CONFIGURE_ARGS+= --enable-compressed	350	CONFIGURE_ARGS+= --enable-compressed
347	SGML_NEEDED= yes	351	XML_NEEDED= yes
348	pre-patch::	352	pre-patch::
349	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed	353	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed
350	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \	354	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
Lines 354-360 Link Here
354	.if defined(WITH_MUTT_NNTP)	358	.if defined(WITH_MUTT_NNTP)
355	DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv	359	DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
356	CONFIGURE_ARGS+= --enable-nntp	360	CONFIGURE_ARGS+= --enable-nntp
357	SGML_NEEDED= yes	361	XML_NEEDED= yes
358	pre-patch::	362	pre-patch::
359	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp	363	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
360	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \	364	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
Lines 364-378 Link Here
364	.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)	368	.if ! defined(WITHOUT_MUTT_QUOTE_PATCH)
365	PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \	369	PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
366	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv	370	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
367	SGML_NEEDED= yes	371	XML_NEEDED= yes
368	.endif	372	.endif
369	.if defined(WITH_MUTT_SIGNATURE_MENU)	373	.if defined(WITH_MUTT_SIGNATURE_MENU)
370	PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.signatures_menu.2.1:cd	374	PATCHFILES+= patch-${CD_PATCH_VERSION}.cd.signatures_menu.2.1:cd
371	SGML_NEEDED= yes	375	XML_NEEDED= yes
372	.endif	376	.endif
373	.if defined(WITH_MUTT_IFDEF_PATCH)	377	.if defined(WITH_MUTT_IFDEF_PATCH)
374	PATCHFILES+= patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1:cd	378	DISTFILES+= patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1:cd
375	SGML_NEEDED= yes	379	#XML_NEEDED= yes
		380	pre-patch::
		381	${CAT} ${DISTDIR}/${DIST_SUBDIR}/patch-${CD_IFDEF_PATCH_VERSION}.cd.ifdef.1 > ${WRKDIR}/patch-ifdef
		382	${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.sgml.head$$/,/^diff/d' \
		383	${WRKDIR}/patch-ifdef
		384	${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-ifdef
376	.endif	385	.endif
377	.if defined(WITH_MUTT_MBOX_HOOK_PATCH)	386	.if defined(WITH_MUTT_MBOX_HOOK_PATCH)
378	PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw	387	PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
Lines 380-386 Link Here
380	.if defined(WITH_MUTT_SIDEBAR_PATCH)	389	.if defined(WITH_MUTT_SIDEBAR_PATCH)
381	SIDEBAR_PATCH= patch-1.5.10i.sidebar.20050816.txt	390	SIDEBAR_PATCH= patch-1.5.10i.sidebar.20050816.txt
382	DISTFILES+= ${SIDEBAR_PATCH}:thomer	391	DISTFILES+= ${SIDEBAR_PATCH}:thomer
383	SGML_NEEDED= yes	392	XML_NEEDED= yes
384	pre-patch::	393	pre-patch::
385	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/${SIDEBAR_PATCH} > ${WRKDIR}/patch-sidebar	394	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/${SIDEBAR_PATCH} > ${WRKDIR}/patch-sidebar
386	@${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \	395	@${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \
Lines 455-475 Link Here
455	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \	464	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \
456	${WRKSRC}/doc/muttrc.man	465	${WRKSRC}/doc/muttrc.man
457	.if ! defined(WITHOUT_MUTT_HTML)	466	.if ! defined(WITHOUT_MUTT_HTML)
458	SGML_USED= yes	467	XML_USED= yes
459	.endif	468	.endif
460	.if defined(SGML_NEEDED) && !defined(WITHOUT_MUTT_SGMLFORMAT)	469	.if defined(XML_NEEDED) && !defined(WITHOUT_MUTT_XML)
461	SGML_USED= yes	470	XML_USED= yes
462	.endif	471	.endif
463	.else # ! NOPORTDOCS	472	.else # ! NOPORTDOCS
464	post-patch::	473	post-patch::
465	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib	474	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
466	.endif # ! NOPORTDOCS	475	.endif # ! NOPORTDOCS
467		476
468	.if ${SGML_USED} == yes	477	.if ${XML_USED} == yes
469	SCRIPTS_ENV+= MUTT_SGML="yes"	478	#BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \
470	BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat	479	# lynx:${PORTSDIR}/www/lynx
471	post-patch::	480	post-patch::
472	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-sgmlformat	481	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-xml
473	.endif	482	.endif
474		483
475	pre-install:	484	pre-install:
Lines 483-491 Link Here
483	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}	492	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
484	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \	493	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
485	../ABOUT-NLS ../contrib/language* ${DOCSDIR}	494	../ABOUT-NLS ../contrib/language* ${DOCSDIR}
486	.if ${SGML_USED} == yes
487	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.latin1 manual.ps ${DOCSDIR}
488	.endif
489	.if defined(WITH_MUTT_NNTP)	495	.if defined(WITH_MUTT_NNTP)
490	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR}	496	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR}
491	.endif	497	.endif

Lines 1-13 Link Here

(-)./distinfo (-10 / +10 lines)
1	MD5 (mutt/mutt-1.5.10i.tar.gz) = 59400d12c6b5b3d122531000e53d1914	1	MD5 (mutt/mutt-1.5.11.tar.gz) = 00e6f8f7c37d4840e5e30583ebee21ce
2	SIZE (mutt/mutt-1.5.10i.tar.gz) = 3156345	2	SIZE (mutt/mutt-1.5.11.tar.gz) = 3187375
3	MD5 (mutt/patch-1.5.10.rr.compressed.gz) = f6cd5bd6c030d5d691d347a6e9d75b6a	3	MD5 (mutt/patch-1.5.11.rr.compressed.gz) = 95ec112ae0ce2cbd1b67bcc68756bf97
4	SIZE (mutt/patch-1.5.10.rr.compressed.gz) = 10095	4	SIZE (mutt/patch-1.5.11.rr.compressed.gz) = 9995
5	MD5 (mutt/patch-1.5.10.vvv.nntp.gz) = ac9a4c8bf25a96648bb08cde4ced4c05	5	MD5 (mutt/patch-1.5.11.vvv.nntp.gz) = f5a2f99940a4bbeef2d1062e9280462c
6	SIZE (mutt/patch-1.5.10.vvv.nntp.gz) = 98153	6	SIZE (mutt/patch-1.5.11.vvv.nntp.gz) = 54943
7	MD5 (mutt/patch-1.5.10.vvv.initials.gz) = 91eea7344625830bf4231dc1d56cb799	7	MD5 (mutt/patch-1.5.11.vvv.initials.gz) = 1d6e82f41b96a47862f6cd7cfd943ec6
8	SIZE (mutt/patch-1.5.10.vvv.initials.gz) = 682	8	SIZE (mutt/patch-1.5.11.vvv.initials.gz) = 684
9	MD5 (mutt/patch-1.5.10.vvv.quote.gz) = a447f9362a9ef37c8fdc58efa73ed326	9	MD5 (mutt/patch-1.5.11.vvv.quote.gz) = 5409e89072f83ffbe87d2358948816db
10	SIZE (mutt/patch-1.5.10.vvv.quote.gz) = 1963	10	SIZE (mutt/patch-1.5.11.vvv.quote.gz) = 1958
11	MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa	11	MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
12	SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545	12	SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
13	MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea	13	MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea

Lines 9-17 Link Here

(-)./files/extra-patch-nodoc-contrib (-4 / +4 lines)
9		9
10	bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@	10	bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
11		11
12	--- doc/Makefile.in.orig Sun Aug 14 11:35:31 2005	12	--- doc/Makefile.in.orig Sun Sep 18 16:56:56 2005
13	+++ doc/Makefile.in Sun Aug 14 11:37:23 2005	13	+++ doc/Makefile.in Sun Sep 18 17:00:01 2005
14	@@ -93,14 +93,6 @@	14	@@ -81,14 +81,6 @@
15	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5	15	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
16	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5	16	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
17	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5	17	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
Lines 22-28 Link Here
22	- for f in $(srcdir_DOCFILES) ; do \	22	- for f in $(srcdir_DOCFILES) ; do \
23	- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \	23	- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
24	- done	24	- done
25	- $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) \|\| true	25	- -$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
26		26
27	uninstall:	27	uninstall:
28	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \	28	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \

Lines 1-66 Link Here

(-)./files/patch-02 (-51 / +23 lines)
1	--- doc/Makefile.in.orig Thu Aug 11 21:37:02 2005	1	--- doc/Makefile.in.orig Sun Sep 18 19:42:14 2005
2	+++ doc/Makefile.in Sun Aug 14 11:09:10 2005	2	+++ doc/Makefile.in Sun Sep 18 19:44:13 2005
3	@@ -64,13 +64,23 @@	3	@@ -68,7 +68,7 @@
4	ChangeLog.old \	4	ChangeLog.old \
5	README NEWS TODO README.SECURITY README.SSL	5	README NEWS TODO README.SECURITY README.SSL
6		6
7	-all: mutt.1 muttrc.man try-html try-txt	7	-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
8	+all: mutt.1	8	+all: mutt.1 muttrc.man
9
10	try-html: ../makedoc$(EXEEXT)
11	- test -f manual.html \|\| $(MAKE) manual.html \|\| cp $(srcdir)/manual*.html ./
12	+ rm -f .html && $(MAKE) manual.html \|\| cp $(srcdir)/manual.html ./
13	+ touch $@
14
15	try-txt: ../makedoc$(EXEEXT)
16	- test -f manual.txt \|\| $(MAKE) manual.txt \|\| cp $(srcdir)/manual.txt ./
17	+ $(MAKE) manual.txt \|\| cp $(srcdir)/manual.txt ./
18	+ touch $@
19	+
20	+try-latin1: ../makedoc$(EXEEXT)
21	+ $(MAKE) manual.latin1 \|\| cp $(srcdir)/manual.latin1 ./
22	+ touch $@
23	+
24	+try-ps: ../makedoc$(EXEEXT)
25	+ $(MAKE) manual.ps \|\| cp $(srcdir)/manual.latin1 ./
26	+ touch $@
27		9
28	install: all instdoc	10	install: all instdoc
29	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1	11	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
30	@@ -91,10 +101,6 @@	12	@@ -89,9 +89,6 @@
31	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \	13	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
32	done	14	done
33	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) \|\| true	15	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
34	- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html	16	- -for f in $(HTML_DOCFILES) ; do \
35	- for file in manual*.html ; do \	17	- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
36	- $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ \|\| true ;\
37	- done	18	- done
38		19
39	uninstall:	20	uninstall:
40	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \	21	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
41	@@ -114,17 +120,20 @@	22	@@ -108,13 +105,13 @@
42		23
43	check:	24	check:
44	manual.txt: manual.sgml	25	manual.txt: manual.html
45	- if linuxdoc -B txt -c latin --pass='-P -c' manual ; then \	26	- -lynx -dump -nolist -with_backspaces $^ > $@ \|\| w3m -dump $^ > $@
46	- uniq < manual.txt \| expand > _manual.txt ; \	27	+# -lynx -dump -nolist -with_backspaces manual.html > $@
47	- rm manual.txt ; \	28
48	+ if sgmlfmt -f ascii manual; then \	29	manual.html: $(srcdir)/html.xsl manual.xml
49	+ uniq < manual.ascii \| expand > _manual.txt ; \	30	- -xsltproc --nonet -o $@ $^
50	+ rm -f manual.txt manual.ascii; \	31	+# -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
51	mv _manual.txt manual.txt ;\	32
52	fi	33	manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
53		34	- -xsltproc --nonet $^
54	manual.html: manual.sgml	35	+# -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
55	- sgml2html manual \|\| true	36	touch stamp-doc-chunked
56	+ sgmlfmt -f html manual \|\| true
57	+
58	+manual.latin1: manual.sgml
59	+ sgmlfmt -f latin1 manual \|\| true
60
61	manual.ps: manual.sgml
62	- sgml2latex --output=ps manual \|\| true
63	+ sgmlfmt -f ps manual \|\| true
64		37
65	clean:	38	manual.pdf: stamp-doc-tex
66	rm -f ~ .html .orig .rej stamp-doc-sgml stamp-doc-man *.ps

Lines 1-13 Link Here

(-)./files/patch-03 (-13 lines)
1	--- doc/manual.sgml.orig Tue May 9 17:15:26 2000
2	+++ doc/manual.sgml Fri May 12 11:05:40 2000
3	@@ -1,5 +1,8 @@
4	-<!doctype linuxdoc system>
5	-
6	+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
7	+<!ENTITY dquot """>
8	+]>
9	+<linuxdoc>
10	+
11	<article>
12
13	<title>The Mutt E-Mail Client

Lines 1-113 Link Here

(-)./files/patch-doc-manual.sgml.head (-113 lines)
1	--- doc/manual.sgml.head.orig Sat Jan 15 10:42:44 2005
2	+++ doc/manual.sgml.head Fri Feb 4 08:05:59 2005
3	@@ -125,24 +125,24 @@
4	<tscreen><verb>
5	^A or <Home> bol move to the start of the line
6	^B or <Left> backward-char move back one char
7	-Esc B backward-word move back one word
8	+Esc B backward-word move back one word
9	^D or <Delete> delete-char delete the char under the cursor
10	^E or <End> eol move to the end of the line
11	^F or <Right> forward-char move forward one char
12	-Esc F forward-word move forward one word
13	+Esc F forward-word move forward one word
14	<Tab> complete complete filename or alias
15	^T complete-query complete address with query
16	^K kill-eol delete to the end of the line
17	-ESC d kill-eow delete to the end ot the word
18	+ESC d kill-eow delete to the end ot the word
19	^W kill-word kill the word in front of the cursor
20	^U kill-line delete entire line
21	^V quote-char quote the next typed key
22	<Up> history-up recall previous string from history
23	<Down> history-down recall next string from history
24	<BackSpace> backspace kill the char in front of the cursor
25	-Esc u upcase-word convert word to upper case
26	-Esc l downcase-word convert word to lower case
27	-Esc c capitalize-word capitalize the word
28	+Esc u upcase-word convert word to upper case
29	+Esc l downcase-word convert word to lower case
30	+Esc c capitalize-word capitalize the word
31	^G n/a abort
32	<Return> n/a finish editing
33	</verb></tscreen>
34	@@ -325,8 +325,8 @@
35	ESC p previous-subthread jump to the start of the previous subthread
36	ESC r read-subthread mark the current subthread as read
37	ESC t tag-thread toggle the tag on the current thread
38	-ESC v collapse-thread toggle collapse for the current thread
39	-ESC V collapse-all toggle collapse for all threads
40	+ESC v collapse-thread toggle collapse for the current thread
41	+ESC V collapse-all toggle collapse for all threads
42	P parent-message jump to parent message in thread
43	</verb></tscreen>
44
45	@@ -513,7 +513,7 @@
46
47	<tscreen><verb>
48	a attach-file attach a file
49	-A attach-message attach message(s) to the message
50	+A attach-message attach message(s) to the message
51	ESC k attach-key attach a PGP public key
52	d edit-description edit description on attachment
53	D detach-file detach a file
54	@@ -529,7 +529,7 @@
55	p pgp-menu select PGP options
56	P postpone-message postpone this message until later
57	q quit quit (abort) sending the message
58	-w write-fcc write the message to a folder
59	+w write-fcc write the message to a folder
60	i ispell check spelling (if available on your system)
61	^F forget-passphrase wipe passphrase(s) from memory
62	</verb></tscreen>
63	@@ -1876,7 +1876,7 @@
64	~G cryptographically encrypted messages
65	~H EXPR messages with a spam attribute matching EXPR
66	~h EXPR messages which contain EXPR in the message header
67	-~k message contains PGP key material
68	+~k message contains PGP key material
69	~i ID message which match ID in the ``Message-ID'' field
70	~L EXPR message is either originated or received by EXPR
71	~l message is addressed to a known mailing list
72	@@ -1894,13 +1894,13 @@
73	~T tagged messages
74	~t USER messages addressed to USER
75	~U unread messages
76	-~v message is part of a collapsed thread.
77	-~V cryptographically verified messages
78	+~v message is part of a collapsed thread.
79	+~V cryptographically verified messages
80	~x EXPR messages which contain EXPR in the `References' field
81	~y EXPR messages which contain EXPR in the `X-Label' field
82	~z [MIN]-[MAX] messages with a size in the range MIN to MAX *)
83	-~= duplicated messages (see $duplicate_threads)
84	-~$ unreferenced messages (requires threaded view)
85	+~= duplicated messages (see $duplicate_threads)
86	+~$ unreferenced messages (requires threaded view)
87	</verb></tscreen>
88
89	Where EXPR, USER, ID, and SUBJECT are
90	@@ -2003,10 +2003,10 @@
91	An error margin is a sign (+ or -), followed by a digit, followed by
92	one of the following units:
93	<verb>
94	-y years
95	-m months
96	-w weeks
97	-d days
98	+y years
99	+m months
100	+w weeks
101	+d days
102	</verb>
103	As a special case, you can replace the sign by a ``*'' character,
104	which is equivalent to giving identical plus and minus error margins.
105	@@ -3044,7 +3044,7 @@
106	to send messages from the command line as well.
107
108	<tscreen><verb>
109	--A expand an alias
110	+-A expand an alias
111	-a attach a file to a message
112	-b specify a blind carbon-copy (BCC) address
113	-c specify a carbon-copy (Cc) address

Lines 1-20 Link Here

(-)./files/patch-doc-mutt.man (-20 lines)
1	--- doc/muttrc.man.orig Wed Mar 19 22:55:03 2003
2	+++ doc/muttrc.man Sun Oct 26 11:16:05 2003
3	@@ -1031,7 +1031,7 @@
4	.B dotlock_program
5	.nf
6	Type: path
7	-Default: \(lq/usr/local/bin/mutt_dotlock\(rq
8	+Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq
9	.fi
10	.IP
11	Contains the path of the mutt_dotlock (8) binary to be used by
12	@@ -4410,7 +4410,7 @@
13	instead of a raw socket. You may be able to use this to set up
14	preauthenticated connections to your IMAP/POP3 server. Example:
15	.IP
16	-tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq
17	+tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq
18	.IP
19	NOTE: For this example to work you must be able to log in to the remote
20	machine without having to enter a password.

Lines 77-103 Link Here

(-)./files/patch-examples (-18 / +18 lines)
77		77
78	into your system's global Muttrc, which normally resides in /etc or	78	into your system's global Muttrc, which normally resides in /etc or
79	/usr/local/etc.	79	/usr/local/etc.
80	--- doc/manual.txt.orig Wed Mar 19 23:30:56 2003	80	--- doc/manual.txt.orig Thu Sep 15 16:22:18 2005
81	+++ doc/manual.txt Wed Mar 26 16:07:20 2003	81	+++ doc/manual.txt Sun Sep 18 15:31:13 2005
82	@@ -4954,8 +4954,8 @@	82	@@ -5004,8 +5004,8 @@
83		83
84	For examples on how to configure these formats for the various	84	For examples on how to configure these formats for the various
85	versions of PGP which are floating around, see the pgp*.rc and gpg.rc	85	versions of PGP which are floating around, see the pgp*.rc and gpg.rc
86	- files in the samples/ subdirectory which has been installed on your	86	- files in the samples/ subdirectory which has been installed on your
87	- system alongside the documentation. (PGP only)	87	- system alongside the documentation. (PGP only)
88	+ files in the share/examples/mutt/ subdirectory which has been installed on	88	+ files in the share/examples/mutt/ subdirectory which has been installed
89	+ your system alongside the documentation. (PGP only)	89	+ on your system alongside the documentation. (PGP only)
90		90
91	66..33..114433.. ppggpp__ggeettkkeeyyss__ccoommmmaanndd	91	6.3.160. pgp_getkeys_command
92		92
93	@@ -5147,8 +5147,8 @@	93	@@ -5203,8 +5203,8 @@
94	``$smime_ca_location''" or "-CAfile ``$smime_ca_location''".	94	$$ssmmiimmee__ccaa__llooccaattiioonn" or "-CAfile $$ssmmiimmee__ccaa__llooccaattiioonn".
95		95
96	For examples on how to configure these formats, see the smime.rc in	96	For examples on how to configure these formats, see the smime.rc in
97	- the samples/ subdirectory which has been installed on your system	97	- the samples/ subdirectory which has been installed on your system
98	- alongside the documentation. (S/MIME only)	98	- alongside the documentation. (S/MIME only)
99	+ the share/examples/mutt/ subdirectory which has been installed on your	99	+ the share/examples/mutt/ subdirectory which has been installed on
100	+ system alongside the documentation. (S/MIME only)	100	+ your system alongside the documentation. (S/MIME only)
101		101
102	66..33..116622.. ssmmiimmee__vveerriiffyy__ccoommmmaanndd	102	6.3.179. smime_verify_command
103		103

Lines 1-27 Link Here

(-)./files/patch-pgp.c (-27 lines)
1	--- pgp.c.orig Thu Aug 11 23:22:41 2005
2	+++ pgp.c Thu Aug 25 08:01:22 2005
3	@@ -381,16 +381,21 @@
4	}
5
6	/* treat empty result as sign of failure */
7	- rewind (pgpout);
8	- if ((c = fgetc (pgpout)) == EOF)
9	+ if (pgpout)
10	+ {
11	+ rewind (pgpout);
12	+ c = fgetc (pgpout);
13	+ ungetc (c, pgpout);
14	+ }
15	+ if (!clearsign && (!pgpout \|\| c == EOF))
16	{
17	mutt_error _("Could not decrypt PGP message");
18	+ mutt_sleep (1);
19	pgp_void_passphrase ();
20	rc = -1;
21
22	goto out;
23	}
24	- ungetc (c, pgpout);
25	}
26
27	/*

Lines 3-20 Link Here

(-)./files/patch-threadcomplete (-32 / +9 lines)
3	+++ PATCHES	3	+++ PATCHES
4	@@ -0,0 +1 @@	4	@@ -0,0 +1 @@
5	+patch-1.5.6+20040904.tg.mutt-thread.3	5	+patch-1.5.6+20040904.tg.mutt-thread.3
6	diff -Nru a/doc/manual.sgml.head b/doc/manual.sgml.head
7	--- doc/manual.sgml.head.orig Fri Feb 4 08:15:50 2005
8	+++ doc/manual.sgml.head Fri Feb 4 08:19:51 2005
9	@@ -1903,6 +1903,8 @@
10	~z [MIN]-[MAX] messages with a size in the range MIN to MAX *)
11	~= duplicated messages (see $duplicate_threads)
12	~$ unreferenced messages (requires threaded view)
13	+~(PATTERN) messages in threads containing messages matching a certain
14	+ pattern, e.g. all threads containing messages from you: ~(~P)
15	</verb></tscreen>
16
17	Where EXPR, USER, ID, and SUBJECT are
18	diff -Nru a/mutt.h b/mutt.h	6	diff -Nru a/mutt.h b/mutt.h
19	--- mutt.h 2004-07-24 12:27:21 +02:00	7	--- mutt.h 2004-07-24 12:27:21 +02:00
20	+++ mutt.h 2004-09-04 12:36:18 +02:00	8	+++ mutt.h 2004-09-04 12:36:18 +02:00
Lines 117-133 Link Here
117	case M_ALL:	105	case M_ALL:
118	return (!pat->not);	106	return (!pat->not);
119	case M_EXPIRED:	107	case M_EXPIRED:
120	--- doc/manual.sgml.head.orig2 Mon Sep 6 09:24:16 2004
121	+++ doc/manual.sgml.head Mon Sep 6 09:25:41 2004
122	@@ -1773,6 +1773,8 @@
123	messages:
124
125	<tscreen><verb>
126	+~a messages in threads that contain at least one tagged message;
127	+ this is the same as ~(~T) [see below for ~(..)]
128	~A all messages
129	~b EXPR messages which contain EXPR in the message body
130	~B EXPR messages which contain EXPR in the whole message
131	--- mutt.h.orig2 Mon Sep 6 09:24:17 2004	108	--- mutt.h.orig2 Mon Sep 6 09:24:17 2004
132	+++ mutt.h Mon Sep 6 09:27:04 2004	109	+++ mutt.h Mon Sep 6 09:27:04 2004
133	@@ -212,6 +212,7 @@	110	@@ -212,6 +212,7 @@
Lines 138-146 Link Here
138		115
139	/* actions for mutt_pattern_comp/mutt_pattern_exec */	116	/* actions for mutt_pattern_comp/mutt_pattern_exec */
140	M_AND,	117	M_AND,
141	--- pattern.c.orig2 Sun Feb 13 09:05:57 2005	118	--- pattern.c.orig2 Sun Sep 18 15:17:46 2005
142	+++ pattern.c Sun Feb 13 09:08:06 2005	119	+++ pattern.c Sun Sep 18 15:19:48 2005
143	@@ -48,6 +48,7 @@	120	@@ -54,6 +54,7 @@
144	}	121	}
145	Flags[] =	122	Flags[] =
146	{	123	{
Lines 148-157 Link Here
148	{ 'A', M_ALL, 0, NULL },	125	{ 'A', M_ALL, 0, NULL },
149	{ 'b', M_BODY, M_FULL_MSG, eat_regexp },	126	{ 'b', M_BODY, M_FULL_MSG, eat_regexp },
150	{ 'B', M_WHOLE_MSG, M_FULL_MSG, eat_regexp },	127	{ 'B', M_WHOLE_MSG, M_FULL_MSG, eat_regexp },
151	@@ -1085,6 +1086,16 @@	128	@@ -1139,6 +1140,16 @@
152	pat->alladdr, 2, h->env->to, h->env->cc)));	129	2, h->env->to, h->env->cc));
153	case M_LIST:	130	case M_LIST: /* known list, subscribed or not */
154	return (pat->not ^ (h->env && mutt_is_list_recipient (pat->alladdr, h->env->to, h->env->cc)));	131	return (pat->not ^ mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc));
155	+ case M_THREADCOMPLETE:	132	+ case M_THREADCOMPLETE:
156	+ { static pattern_t tmp;	133	+ { static pattern_t tmp;
157	+ static short pattern_set = 0;	134	+ static short pattern_set = 0;
Lines 162-167 Link Here
162	+ }	139	+ }
163	+ return (pat->not ^ (h->env && match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1)));	140	+ return (pat->not ^ (h->env && match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1)));
164	+ }	141	+ }
		142	case M_SUBSCRIBED_LIST:
		143	return (pat->not ^ mutt_is_list_recipient (pat->alladdr, h->env->to, h->env->cc));
165	case M_PERSONAL_RECIP:	144	case M_PERSONAL_RECIP:
166	return (pat->not ^ (h->env && match_user (pat->alladdr, h->env->to, h->env->cc)));
167	case M_PERSONAL_FROM: