Hi!
Attached is an update to mutt-1.5.10. Works for me on i386, sparc64 and
amd64. (for some weeks already)
I've also included a small fix to make the table in the muttrc manpage
readable. (the manpage needs to be preprocessed by tbl)
A (huge) ChangeLog is available at:
http://www.mutt.org/doc/devel/ChangeLog
Please test and comment.
Bernd
PS: I'm not sure if we need to bump the PKGNAME in stable. There's just
this one file removed from stable/distinfo...
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/mail/mutt/Makefile.inc,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile.inc
--- Makefile.inc 3 May 2005 15:37:16 -0000 1.14
+++ Makefile.inc 5 Sep 2005 09:47:12 -0000
@@ -11,7 +11,6 @@
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/
MASTER_SITES0= http://www.spinnaker.de/mutt/compressed/
-MASTER_SITES1= http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/
MODULES= devel/gettext
@@ -72,12 +71,9 @@
.endif
.if ${FLAVOR:L:Mhcache}
-PATCHFILES+= mutt-cvs-header-cache.29:1
-PATCH_DIST_STRIP= -p1
CONFIGURE_ARGS+= --enable-hcache
LIB_DEPENDS+= gdbm.2::databases/gdbm
.else
-SUPDISTFILES+= mutt-cvs-header-cache.29:1
CONFIGURE_ARGS+= --without-gdbm
.endif
Index: snapshot/Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/Makefile,v
retrieving revision 1.33
diff -u -u -r1.33 Makefile
--- snapshot/Makefile 5 Jul 2005 12:17:16 -0000 1.33
+++ snapshot/Makefile 5 Sep 2005 09:47:12 -0000
@@ -2,7 +2,7 @@
COMMENT= "tty-based e-mail client, development version"
-VERSION= 1.5.9
+VERSION= 1.5.10
MASTER_SITES= ${MASTER_SITES_MUTT:=devel/}
AUTOCONF_VERSION= 2.59
Index: snapshot/distinfo
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/distinfo,v
retrieving revision 1.18
diff -u -u -r1.18 distinfo
--- snapshot/distinfo 5 Jul 2005 12:17:17 -0000 1.18
+++ snapshot/distinfo 5 Sep 2005 09:47:12 -0000
@@ -1,12 +1,8 @@
-MD5 (mutt-1.5.9i.tar.gz) = c5318eba3404ebd78a15c680fa1b6056
-MD5 (mutt-cvs-header-cache.29) = 8bd12eb073ef94712f3a88eb8493f195
-MD5 (patch-1.5.9.rr.compressed.1.gz) = f372bd436424d8061440ecc8796a5978
-RMD160 (mutt-1.5.9i.tar.gz) = 888848046382b3c4e8b18eacd30af4291a7ed23d
-RMD160 (mutt-cvs-header-cache.29) = b9c84cdc699ca8b053cc1b39cbccb225b5701749
-RMD160 (patch-1.5.9.rr.compressed.1.gz) =
393d45d9c5bea4892b28fd6a522417ffeb25736d
-SHA1 (mutt-1.5.9i.tar.gz) = a380747b86f11b2b3bf3c4407e70bfebe6d0af02
-SHA1 (mutt-cvs-header-cache.29) = 4c952f75df9ce662e99e68f72934b3a1d3b0e1eb
-SHA1 (patch-1.5.9.rr.compressed.1.gz) =
866b8138434311185539ac048251ad78085ced44
-SIZE (mutt-1.5.9i.tar.gz) = 3036003
-SIZE (mutt-cvs-header-cache.29) = 5120
-SIZE (patch-1.5.9.rr.compressed.1.gz) = 13673
+MD5 (mutt-1.5.10i.tar.gz) = 59400d12c6b5b3d122531000e53d1914
+MD5 (patch-1.5.10.rr.compressed.1.gz) = 10f698f45a437184f198c7dd37bb86c6
+RMD160 (mutt-1.5.10i.tar.gz) = e6855dd72e41b5e451b17bac9934bea8ca0c5db7
+RMD160 (patch-1.5.10.rr.compressed.1.gz) =
ab025dd45da33d46b14c5bc077c5c533db0794c4
+SHA1 (mutt-1.5.10i.tar.gz) = 3f9cbd330b1458a5c317fd29331f425aa36e0877
+SHA1 (patch-1.5.10.rr.compressed.1.gz) =
fb1e9deae51ef19da3d08ed83be50c808cb00617
+SIZE (mutt-1.5.10i.tar.gz) = 3156345
+SIZE (patch-1.5.10.rr.compressed.1.gz) = 13525
Index: snapshot/patches/patch-browser_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-browser_c,v
retrieving revision 1.2
diff -u -u -r1.2 patch-browser_c
--- snapshot/patches/patch-browser_c 7 Feb 2005 17:16:16 -0000 1.2
+++ snapshot/patches/patch-browser_c 5 Sep 2005 09:47:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-browser_c,v 1.2 2005/02/07 17:16:16 naddy Exp $
---- browser.c.orig Thu Feb 3 09:23:58 2005
-+++ browser.c Thu Feb 3 09:25:52 2005
-@@ -22,6 +22,7 @@
+--- browser.c.orig Thu Aug 11 21:37:01 2005
++++ browser.c Fri Aug 12 09:21:37 2005
+@@ -27,6 +27,7 @@
#include "buffy.h"
#include "mapping.h"
#include "sort.h"
@@ -9,7 +9,7 @@
#include "mailbox.h"
#include "browser.h"
#ifdef USE_IMAP
-@@ -346,6 +347,21 @@ static void init_state (struct browser_s
+@@ -351,6 +352,21 @@ static void init_state (struct browser_s
menu->data = state->entry;
}
@@ -31,7 +31,7 @@
static int examine_directory (MUTTMENU *menu, struct browser_state *state,
char *d, const char *prefix)
{
-@@ -409,6 +425,7 @@ static int examine_directory (MUTTMENU *
+@@ -414,6 +430,7 @@ static int examine_directory (MUTTMENU *
tmp = Incoming;
while (tmp && mutt_strcmp (buffer, tmp->path))
tmp = tmp->next;
@@ -39,7 +39,7 @@
add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0);
}
closedir (dp);
-@@ -454,6 +471,7 @@ static int examine_mailboxes (MUTTMENU *
+@@ -459,6 +476,7 @@ static int examine_mailboxes (MUTTMENU *
strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
mutt_pretty_mailbox (buffer);
Index: snapshot/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-configure_in,v
retrieving revision 1.2
diff -u -u -r1.2 patch-configure_in
--- snapshot/patches/patch-configure_in 7 Feb 2005 17:16:16 -0000 1.2
+++ snapshot/patches/patch-configure_in 5 Sep 2005 09:47:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.2 2005/02/07 17:16:16 naddy Exp $
---- configure.in.orig Thu Feb 3 09:26:11 2005
-+++ configure.in Thu Feb 3 09:26:25 2005
-@@ -473,7 +473,7 @@ docdir=$mutt_cv_docdir
+--- configure.in.orig Thu Aug 11 23:49:24 2005
++++ configure.in Fri Aug 12 09:21:37 2005
+@@ -471,7 +471,7 @@ docdir=$mutt_cv_docdir
AC_SUBST(docdir)
if test x$mutt_cv_setgid = xyes; then
Index: snapshot/patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-doc_Makefile_in,v
retrieving revision 1.2
diff -u -u -r1.2 patch-doc_Makefile_in
--- snapshot/patches/patch-doc_Makefile_in 7 Feb 2005 17:16:16 -0000
1.2
+++ snapshot/patches/patch-doc_Makefile_in 5 Sep 2005 09:47:12 -0000
@@ -1,12 +1,28 @@
$OpenBSD: patch-doc_Makefile_in,v 1.2 2005/02/07 17:16:16 naddy Exp $
---- doc/Makefile.in.orig Thu Feb 3 09:26:40 2005
-+++ doc/Makefile.in Thu Feb 3 09:26:54 2005
-@@ -63,7 +63,7 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTA
+--- doc/Makefile.in.orig Thu Aug 11 21:37:02 2005
++++ doc/Makefile.in Fri Aug 12 09:36:51 2005
+@@ -64,7 +64,7 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTA
ChangeLog.old \
README NEWS TODO README.SECURITY README.SSL
--all: muttrc.man try-html try-txt
-+all: muttrc.man # try-html try-txt
+-all: mutt.1 muttrc.man try-html try-txt
++all: mutt.1 muttrc.man
- try-html: ../makedoc
+ try-html: ../makedoc$(EXEEXT)
test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html
./
+@@ -170,12 +170,13 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconf
+ -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 | \
+ cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\
+- > muttrc.man
++ > muttrc.man.tbl
++ /usr/bin/tbl muttrc.man.tbl > muttrc.man
+ touch stamp-doc-man
+
+ manual.sgml stamp-doc-sgml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h
manual.sgml.head manual.sgml.tail $(top_srcdir)/VERSION
Index: snapshot/patches/patch-filter_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-filter_c,v
retrieving revision 1.2
diff -u -u -r1.2 patch-filter_c
--- snapshot/patches/patch-filter_c 7 Feb 2005 17:16:16 -0000 1.2
+++ snapshot/patches/patch-filter_c 5 Sep 2005 09:47:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-filter_c,v 1.2 2005/02/07 17:16:16 naddy Exp $
---- filter.c.orig Wed Feb 2 15:55:59 2005
-+++ filter.c Wed Feb 2 15:56:10 2005
-@@ -113,7 +113,7 @@ mutt_create_filter_fd (const char *cmd,
+--- filter.c.orig Thu Feb 3 19:47:52 2005
++++ filter.c Fri Aug 12 09:21:37 2005
+@@ -117,7 +117,7 @@ mutt_create_filter_fd (const char *cmd,
close (fderr);
}
Index: snapshot/patches/patch-imap_auth_gss_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-imap_auth_gss_c,v
retrieving revision 1.2
diff -u -u -r1.2 patch-imap_auth_gss_c
--- snapshot/patches/patch-imap_auth_gss_c 7 Feb 2005 17:16:16 -0000
1.2
+++ snapshot/patches/patch-imap_auth_gss_c 5 Sep 2005 09:47:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-imap_auth_gss_c,v 1.2 2005/02/07 17:16:16 naddy Exp $
---- imap/auth_gss.c.orig Thu Feb 3 00:05:49 2005
-+++ imap/auth_gss.c Thu Feb 3 00:06:07 2005
-@@ -28,7 +28,7 @@
+--- imap/auth_gss.c.orig Thu Feb 3 19:47:54 2005
++++ imap/auth_gss.c Fri Aug 12 09:21:37 2005
+@@ -29,7 +29,7 @@
#include <netinet/in.h>
#ifdef HAVE_HEIMDAL
Index: snapshot/patches/patch-mutt_tunnel_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-mutt_tunnel_c,v
retrieving revision 1.2
diff -u -u -r1.2 patch-mutt_tunnel_c
--- snapshot/patches/patch-mutt_tunnel_c 7 Feb 2005 17:16:16 -0000
1.2
+++ snapshot/patches/patch-mutt_tunnel_c 5 Sep 2005 09:47:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-mutt_tunnel_c,v 1.2 2005/02/07 17:16:16 naddy Exp $
---- mutt_tunnel.c.orig Thu Feb 3 00:08:14 2005
-+++ mutt_tunnel.c Thu Feb 3 00:08:46 2005
-@@ -91,7 +91,7 @@ static int tunnel_socket_open (CONNECTIO
+--- mutt_tunnel.c.orig Thu Aug 11 21:37:02 2005
++++ mutt_tunnel.c Fri Aug 12 09:21:37 2005
+@@ -95,7 +95,7 @@ static int tunnel_socket_open (CONNECTIO
/* Don't let the subprocess think it can use the controlling tty */
setsid ();
Index: snapshot/patches/patch-system_c
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-system_c,v
retrieving revision 1.2
diff -u -u -r1.2 patch-system_c
--- snapshot/patches/patch-system_c 7 Feb 2005 17:16:16 -0000 1.2
+++ snapshot/patches/patch-system_c 5 Sep 2005 09:47:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-system_c,v 1.2 2005/02/07 17:16:16 naddy Exp $
---- system.c.orig Thu Feb 3 09:23:21 2005
-+++ system.c Thu Feb 3 09:23:37 2005
-@@ -110,7 +110,7 @@ int _mutt_system (const char *cmd, int f
+--- system.c.orig Thu Feb 3 19:47:53 2005
++++ system.c Fri Aug 12 09:21:37 2005
+@@ -114,7 +114,7 @@ int _mutt_system (const char *cmd, int f
sigaction (SIGTSTP, &act, NULL);
sigaction (SIGCONT, &act, NULL);
Index: stable/Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/Makefile,v
retrieving revision 1.22
diff -u -u -r1.22 Makefile
--- stable/Makefile 30 Jun 2005 05:24:53 -0000 1.22
+++ stable/Makefile 5 Sep 2005 09:47:12 -0000
@@ -2,7 +2,7 @@
COMMENT= "tty-based e-mail client"
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
VERSION= 1.4.2
MASTER_SITES= ${MASTER_SITES_MUTT}
Index: stable/distinfo
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/distinfo,v
retrieving revision 1.13
diff -u -u -r1.13 distinfo
--- stable/distinfo 6 Mar 2005 01:44:20 -0000 1.13
+++ stable/distinfo 5 Sep 2005 09:47:12 -0000
@@ -1,12 +1,8 @@
MD5 (mutt-1.4.2i.tar.gz) = 6045b47cbba8170d6a9fdccc1aa817b9
-MD5 (mutt-cvs-header-cache.29) = 8bd12eb073ef94712f3a88eb8493f195
MD5 (patch-1.4.2.rr.compressed.1.gz) = 36381ca7ff377a0d79c23b89e8388171
RMD160 (mutt-1.4.2i.tar.gz) = c44ceb3f29144468d111451c1b7402240ed9450e
-RMD160 (mutt-cvs-header-cache.29) = b9c84cdc699ca8b053cc1b39cbccb225b5701749
RMD160 (patch-1.4.2.rr.compressed.1.gz) =
d99566ea664bde7f5f19f4686638a728e04c3ee8
SHA1 (mutt-1.4.2i.tar.gz) = 2c5859bf0400f4a23c3b49f4ceb1c9e16b2c5462
-SHA1 (mutt-cvs-header-cache.29) = 4c952f75df9ce662e99e68f72934b3a1d3b0e1eb
SHA1 (patch-1.4.2.rr.compressed.1.gz) =
e39fb088a899b4585ed5393877fb8654e5d943b6
SIZE (mutt-1.4.2i.tar.gz) = 2557481
-SIZE (mutt-cvs-header-cache.29) = 5120
SIZE (patch-1.4.2.rr.compressed.1.gz) = 14065
