this updates mutt to 1.5.14; mostly imap fixes including:
fix null-pointer dereferences on partial imap mailbox loads
more robust with some servers
port changes;
distribution now using autoconf 2.60;
bumped snapshot AUTOCONF_VERSION
kept stable at 2.59
build -sidebar package
specify mandir to avoid using default which is now share/man
so far I have tested mutt-1.5.14-hcache-sidebar with imap mailboxes
on amd64 and sparc64, and built variants with all the different patches
on amd64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/Makefile,v
retrieving revision 1.51
diff -u -p -u -r1.51 Makefile
--- Makefile 19 Feb 2005 15:42:58 -0000 1.51
+++ Makefile 6 Apr 2007 10:50:48 -0000
@@ -5,5 +5,6 @@
SUBDIR += snapshot
SUBDIR += snapshot,compressed
SUBDIR += snapshot,hcache
+ SUBDIR += snapshot,sidebar
.include <bsd.port.subdir.mk>
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/mail/mutt/Makefile.inc,v
retrieving revision 1.23
diff -u -p -u -r1.23 Makefile.inc
--- Makefile.inc 3 Aug 2006 19:56:08 -0000 1.23
+++ Makefile.inc 6 Apr 2007 10:50:48 -0000
@@ -10,7 +10,7 @@ MASTER_SITES_MUTT= ftp://ftp.fu-berlin.d
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/
MASTER_SITES0= http://www.spinnaker.de/mutt/compressed/
-MASTER_SITES1= http://mirrors.protection.cx/~jolan/
+MASTER_SITES1= http://spacehopper.org/
MODULES= devel/gettext
@@ -25,7 +25,6 @@ WANTLIB= c crypto des ssl
FLAVORS+= slang mixmaster compressed
FLAVOR?=
-AUTOCONF_VERSION?= 2.59
CONFIGURE_STYLE= autoconf old
CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \
--with-docdir="${PREFIX}/share/doc/mutt" \
@@ -35,7 +34,8 @@ CONFIGURE_ARGS= --with-sharedir="${PREFI
--enable-imap \
--enable-pop \
--with-ssl \
- --sysconfdir=${CONFDIR}
+ --sysconfdir=${CONFDIR} \
+ --mandir=${PREFIX}/man
.if ${KERBEROS5} == "yes"
CONFIGURE_ARGS+=--with-gss
@@ -85,10 +85,10 @@ CONFIGURE_ARGS+= --without-idn
.endif
.if ${FLAVOR:L:Msidebar}
-PATCHFILES+= patch-1.5.12.sidebar.20060720.txt-fixed:1
+PATCHFILES+= patch-1.5.14.sidebar.20070223.txt-fixed:1
PATCH_DIST_STRIP= -p1
.else
-SUPDISTFILES+= patch-1.5.12.sidebar.20060720.txt-fixed:1
+SUPDISTFILES+= patch-1.5.14.sidebar.20070223.txt-fixed:1
.endif
.if defined(HOMESPOOL)
Index: snapshot/Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/Makefile,v
retrieving revision 1.40
diff -u -p -u -r1.40 Makefile
--- snapshot/Makefile 2 Aug 2006 14:30:09 -0000 1.40
+++ snapshot/Makefile 6 Apr 2007 10:50:48 -0000
@@ -2,9 +2,10 @@
COMMENT= "tty-based e-mail client, development version"
-VERSION= 1.5.12
+VERSION= 1.5.14
DISTNAME= mutt-${VERSION}
MASTER_SITES= ${MASTER_SITES_MUTT:=devel/}
+AUTOCONF_VERSION?= 2.60
FLAVORS= hcache idn sidebar
Index: snapshot/distinfo
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/distinfo,v
retrieving revision 1.24
diff -u -p -u -r1.24 distinfo
--- snapshot/distinfo 5 Apr 2007 16:20:03 -0000 1.24
+++ snapshot/distinfo 6 Apr 2007 10:50:48 -0000
@@ -1,15 +1,15 @@
-MD5 (mutt-1.5.12.tar.gz) = VxlsgWIRpykA/cVDQesBMg==
-MD5 (patch-1.5.12.rr.compressed.1.gz) = u35DnXSyLt6RLS0whisTZw==
-MD5 (patch-1.5.12.sidebar.20060720.txt-fixed) = D50gbC1jspWBqTT2rt/7wg==
-RMD160 (mutt-1.5.12.tar.gz) = 5o1MWwmbgUh2nROKNvqFYbJ4lpw=
-RMD160 (patch-1.5.12.rr.compressed.1.gz) = fJujLZRMyELDQFNe5ikTMFLiaA8=
-RMD160 (patch-1.5.12.sidebar.20060720.txt-fixed) = vqh6fLv/g4mRLb2VIxYZ9dLQJ+4=
-SHA1 (mutt-1.5.12.tar.gz) = u4iKNfQqd95+MmwDtghUrRzCZuo=
-SHA1 (patch-1.5.12.rr.compressed.1.gz) = I9Ix9D2D4B55zemGFnkRZUFDZEY=
-SHA1 (patch-1.5.12.sidebar.20060720.txt-fixed) = 3t8eNwwIwiTVYrUkk1mKNKe2HP8=
-SHA256 (mutt-1.5.12.tar.gz) = DQwqts6g2TV5vFSQ+v2uO/ZABw2ZNJDHsAzKxPqAi2c=
-SHA256 (patch-1.5.12.rr.compressed.1.gz) =
3XJf+4BlEhPJbbTvta8NASJzQMvgr0L0mHdTnVoEjpE=
-SHA256 (patch-1.5.12.sidebar.20060720.txt-fixed) =
aodlLbf+M3VRvt3CBISTfnbf6Kf3JxChnJXvfBCyX+M=
-SIZE (mutt-1.5.12.tar.gz) = 3440835
-SIZE (patch-1.5.12.rr.compressed.1.gz) = 10430
-SIZE (patch-1.5.12.sidebar.20060720.txt-fixed) = 47421
+MD5 (mutt-1.5.14.tar.gz) = bTO08AdOOXcgIdlHxJswxg==
+MD5 (patch-1.5.14.rr.compressed.1.gz) = p5BFOZc/gAyrXOOIhTQggQ==
+MD5 (patch-1.5.14.sidebar.20070223.txt) = tMuT7HBTyivh9CU9jFRZNw==
+RMD160 (mutt-1.5.14.tar.gz) = 7U7q9103dX7Vs3DpdjtvhSTfXKc=
+RMD160 (patch-1.5.14.rr.compressed.1.gz) = B1aoeMwwljbfFkz+IVB+hVQULE8=
+RMD160 (patch-1.5.14.sidebar.20070223.txt) = 3tv1vqMJzBABbHWP69/r7OHGKgU=
+SHA1 (mutt-1.5.14.tar.gz) = e+CYwTMC+ripVAldF6mmTh4VGcE=
+SHA1 (patch-1.5.14.rr.compressed.1.gz) = wKdIhlFf7ZSCax1fjSp8QqnqbyY=
+SHA1 (patch-1.5.14.sidebar.20070223.txt) = MpVrGPz1b0Uw4CRhwORqlNP7BSc=
+SHA256 (mutt-1.5.14.tar.gz) = nb7ii9SKDxd5ujsA+Y3adKP2KegQnxhCYW1IuFATlGo=
+SHA256 (patch-1.5.14.rr.compressed.1.gz) =
9lg4ajClrkeMOrRxG6hkds5VcSc++9BVxOj1+sGfbUw=
+SHA256 (patch-1.5.14.sidebar.20070223.txt) =
VsX8YqUO8gMXNubkrugZMURORUW4bwVjZJYoTkqI8zE=
+SIZE (mutt-1.5.14.tar.gz) = 3441678
+SIZE (patch-1.5.14.rr.compressed.1.gz) = 10558
+SIZE (patch-1.5.14.sidebar.20070223.txt) = 50978
Index: snapshot/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-Makefile_in
--- snapshot/patches/patch-Makefile_in 2 Aug 2006 14:30:09 -0000 1.3
+++ snapshot/patches/patch-Makefile_in 6 Apr 2007 10:50:48 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2006/08/02 14:30:09 bernd Exp $
---- Makefile.in.orig Fri Jul 14 20:21:03 2006
-+++ Makefile.in Fri Jul 21 18:08:41 2006
-@@ -939,7 +939,7 @@ info: info-recursive
+--- Makefile.in.orig Fri Sep 8 16:40:31 2006
++++ Makefile.in Fri Apr 6 11:08:24 2007
+@@ -944,7 +944,7 @@ info: info-recursive
info-am:
Index: snapshot/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-configure_in,v
retrieving revision 1.5
diff -u -p -u -r1.5 patch-configure_in
--- snapshot/patches/patch-configure_in 2 Aug 2006 14:30:09 -0000 1.5
+++ snapshot/patches/patch-configure_in 6 Apr 2007 10:50:48 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.5 2006/08/02 14:30:09 bernd Exp $
---- configure.in.orig Fri Jul 14 20:15:32 2006
-+++ configure.in Sat Jul 15 11:06:15 2006
-@@ -476,7 +476,7 @@ docdir=$mutt_cv_docdir
+--- configure.in.orig Fri Sep 1 08:00:18 2006
++++ configure.in Fri Apr 6 11:08:24 2007
+@@ -531,7 +531,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.5
diff -u -p -u -r1.5 patch-doc_Makefile_in
--- snapshot/patches/patch-doc_Makefile_in 2 Aug 2006 14:30:09 -0000
1.5
+++ snapshot/patches/patch-doc_Makefile_in 6 Apr 2007 10:50:48 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-doc_Makefile_in,v 1.5 2006/08/02 14:30:09 bernd Exp $
---- doc/Makefile.in.orig Wed Jul 5 10:40:07 2006
-+++ doc/Makefile.in Sat Jul 15 11:08:39 2006
-@@ -71,7 +71,7 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTA
+--- doc/Makefile.in.orig Sun Nov 19 05:13:59 2006
++++ doc/Makefile.in Fri Apr 6 11:08:24 2007
+@@ -395,7 +395,7 @@ uninstall-am: uninstall-info-am uninstal
all: ../makedoc$(EXEEXT)
$(MAKE) makedoc-all
-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
+makedoc-all: mutt.1 muttrc.man
- install: makedoc-all instdoc
+ install-data-local: makedoc-all instdoc
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -171,8 +171,8 @@ update-doc: stamp-doc-xml stamp-doc-chun
+@@ -470,8 +470,8 @@ update-doc: stamp-doc-xml stamp-doc-chun
muttrc.man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head
muttrc.man.tail
$(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \
@@ -19,5 +19,5 @@ $OpenBSD: patch-doc_Makefile_in,v 1.5 20
+ cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail | \
+ /usr/bin/tbl > muttrc.man
- EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
- -e 's,@bindir\@,$(bindir),g' \
+ mutt.1: $(srcdir)/mutt.man
+ $(EDIT) $(srcdir)/mutt.man > $@
Index: snapshot/pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -u -r1.15 PLIST
--- snapshot/pkg/PLIST 2 Aug 2006 14:30:09 -0000 1.15
+++ snapshot/pkg/PLIST 6 Apr 2007 10:50:48 -0000
@@ -40,6 +40,7 @@ share/doc/mutt/patch-notes.txt
share/doc/mutt/reference.html
share/doc/mutt/samples/
share/doc/mutt/smime-notes.txt
+share/doc/mutt/tuning.html
share/examples/mutt/
@sample ${CONFDIR}/
share/examples/mutt/Mush.rc
Index: stable/Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/stable/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- stable/Makefile 2 Aug 2006 14:30:09 -0000 1.30
+++ stable/Makefile 6 Apr 2007 10:50:48 -0000
@@ -5,5 +5,6 @@ COMMENT= "tty-based e-mail client"
VERSION= 1.4.2.2
DISTNAME= mutt-${VERSION}i
MASTER_SITES= ${MASTER_SITES_MUTT}
+AUTOCONF_VERSION?= 2.59
.include <bsd.port.mk>
