tests wanted, especially from anybody using the £&$^"$&"! sidebar patch.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/Makefile,v
retrieving revision 1.78
diff -u -p -r1.78 Makefile
--- Makefile 23 Aug 2013 16:40:29 -0000 1.78
+++ Makefile 18 Oct 2013 11:33:13 -0000
@@ -2,9 +2,8 @@
COMMENT= tty-based e-mail client, development version
-DISTNAME= mutt-1.5.21
+DISTNAME= mutt-1.5.22
EPOCH= 0
-REVISION= 5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mutt/} \
${MASTER_SITES_MUTT:=devel/}
@@ -29,11 +28,11 @@ WANTLIB+= sasl2
MUTTRCDIR= doc/
-DIST_COMPRESSED=compressed-5302767aa6aa.gz:2
-DIST_SIDEBAR= sidebar-5302767aa6aa.gz:2
+DIST_COMPRESSED=compressed-1.5.22.diff0.gz:2
+DIST_SIDEBAR= sidebar-1.5.22.diff0.gz:2
# http://cedricduval.free.fr/mutt/patches/
-PATCHFILES+= trashfolder-5302767aa6aa.gz:2
+PATCHFILES+= trashfolder-1.5.22.diff0.gz:2
.if ${FLAVOR:Msidebar}
PATCHFILES+= ${DIST_SIDEBAR}
@@ -43,7 +42,6 @@ SUPDISTFILES+= ${DIST_SIDEBAR}
AUTOMAKE_VERSION= 1.9
CONFIGURE_STYLE= gnu
-USE_GROFF = Yes
BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
post-patch:
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo 14 Mar 2013 10:14:10 -0000 1.35
+++ distinfo 18 Oct 2013 11:33:13 -0000
@@ -1,8 +1,8 @@
-SHA256 (mutt/compressed-5302767aa6aa.gz) =
wip+TwZMzA3Gu1WF5ZBR96hKvz6qfd5JalqB9bn/uB0=
-SHA256 (mutt/mutt-1.5.21.tar.gz) = IUHzbo0PT3HJymeAAB58xnn+MT5kOVP8B/ABIj5nxKA=
-SHA256 (mutt/sidebar-5302767aa6aa.gz) =
TJdd4RHwJfmiM5hHKGKNmLEGCvpIVIvNBumPXN1Juh8=
-SHA256 (mutt/trashfolder-5302767aa6aa.gz) =
Axw0VlOhhfUcvzg66Hj21wCJzwGllJrePo+S5flXtBg=
-SIZE (mutt/compressed-5302767aa6aa.gz) = 6315
-SIZE (mutt/mutt-1.5.21.tar.gz) = 3716886
-SIZE (mutt/sidebar-5302767aa6aa.gz) = 11762
-SIZE (mutt/trashfolder-5302767aa6aa.gz) = 2793
+SHA256 (mutt/compressed-1.5.22.diff0.gz) =
sbVFGEmgnjazv6nHGqYurtVW6afvayUoHm+JrS3xkDs=
+SHA256 (mutt/mutt-1.5.22.tar.gz) = j+rokO0HWKUQi6+u8nvY/Jw3hnWs8lo8Yg8se3VA86c=
+SHA256 (mutt/sidebar-1.5.22.diff0.gz) =
YYmttj4rGBQYil/wVRgLh1nkcAagQs5rx/BbRwm+kiE=
+SHA256 (mutt/trashfolder-1.5.22.diff0.gz) =
zpZBRCZKfU8SHnomkrHqkuvqXwMIm//2lh1IXzM5w7g=
+SIZE (mutt/compressed-1.5.22.diff0.gz) = 6350
+SIZE (mutt/mutt-1.5.22.tar.gz) = 3782237
+SIZE (mutt/sidebar-1.5.22.diff0.gz) = 12234
+SIZE (mutt/trashfolder-1.5.22.diff0.gz) = 2747
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-configure_ac,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure_ac
--- patches/patch-configure_ac 8 Sep 2010 09:57:28 -0000 1.5
+++ patches/patch-configure_ac 18 Oct 2013 11:33:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.5 2010/09/08 09:57:28 sthen Exp $
---- configure.ac.orig Wed Aug 25 00:30:49 2010
-+++ configure.ac Sat Sep 4 10:33:30 2010
-@@ -549,7 +549,7 @@ fi
+--- configure.ac.orig Mon Apr 22 07:14:53 2013
++++ configure.ac Fri Oct 18 09:58:16 2013
+@@ -550,7 +550,7 @@ fi
AC_SUBST(docdir)
if test x$mutt_cv_setgid = xyes; then
Index: patches/patch-doc_Makefile_am
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/patches/patch-doc_Makefile_am,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_Makefile_am
--- patches/patch-doc_Makefile_am 22 Oct 2010 17:00:20 -0000 1.2
+++ patches/patch-doc_Makefile_am 18 Oct 2013 11:33:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_am,v 1.2 2010/10/22 17:00:20 naddy Exp $
---- doc/Makefile.am.orig Tue Aug 25 21:08:52 2009
-+++ doc/Makefile.am Fri Oct 22 18:45:59 2010
-@@ -161,8 +161,8 @@ update-doc: stamp-doc-xml stamp-doc-chunked stamp-doc-
+--- doc/Makefile.am.orig Fri Oct 18 05:48:24 2013
++++ doc/Makefile.am Fri Oct 18 09:58:16 2013
+@@ -165,8 +165,8 @@ update-doc: stamp-doc-xml stamp-doc-chunked stamp-doc-
muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head
muttrc.man.tail
$(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -m | \
Index: patches/patch-muttlib_c
===================================================================
RCS file: patches/patch-muttlib_c
diff -N patches/patch-muttlib_c
--- patches/patch-muttlib_c 14 Mar 2013 10:14:10 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-muttlib_c,v 1.4 2013/03/14 10:14:10 sthen Exp $
-
-fix segfault when $message_cachedir is set and opening a POP3 mailbox.
-upstream 1a4c43138685, fixes bug#3457
-
---- muttlib.c.orig Wed Mar 13 16:22:39 2013
-+++ muttlib.c Wed Mar 13 16:22:40 2013
-@@ -1962,6 +1962,7 @@ void mutt_encode_path (char *dest, size_t dlen, const
- {
- char *p = safe_strdup (src);
- int rc = mutt_convert_string (&p, Charset, "utf-8", 0);
-- strfcpy (dest, rc == 0 ? p : src, dlen);
-+ /* `src' may be NULL, such as when called from the pop3 driver. */
-+ strfcpy (dest, (rc == 0) ? NONULL(p) : NONULL(src), dlen);
- FREE (&p);
- }
Index: patches/patch-rfc2047_c
===================================================================
RCS file: patches/patch-rfc2047_c
diff -N patches/patch-rfc2047_c
--- patches/patch-rfc2047_c 2 Oct 2010 01:22:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-rfc2047_c,v 1.1 2010/10/02 01:22:12 sthen Exp $
-
-RFC2047 encode/decode the group name in an address list.
-upstream f2452f1f1fef, fixes bug#3317
-
---- rfc2047.c.orig Sat Oct 2 01:57:10 2010
-+++ rfc2047.c Sat Oct 2 01:58:41 2010
-@@ -614,6 +614,8 @@ void rfc2047_encode_adrlist (ADDRESS *addr, const char
- {
- if (ptr->personal)
- _rfc2047_encode_string (&ptr->personal, 1, col);
-+ else if (ptr->group && ptr->mailbox)
-+ _rfc2047_encode_string (&ptr->mailbox, 1, col);
- #ifdef EXACT_ADDRESS
- if (ptr->val)
- _rfc2047_encode_string (&ptr->val, 1, col);
-@@ -910,6 +912,8 @@ void rfc2047_decode_adrlist (ADDRESS *a)
- if (a->personal && ((strstr (a->personal, "=?") != NULL) ||
- (AssumedCharset && *AssumedCharset)))
- rfc2047_decode (&a->personal);
-+ else if (a->group && a->mailbox && (strstr (a->mailbox, "=?") != NULL))
-+ rfc2047_decode (&a->mailbox);
- #ifdef EXACT_ADDRESS
- if (a->val && strstr (a->val, "=?") != NULL)
- rfc2047_decode (&a->val);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/mutt/snapshot/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST 8 Sep 2010 09:57:28 -0000 1.20
+++ pkg/PLIST 18 Oct 2013 11:33:13 -0000
@@ -11,6 +11,8 @@ bin/smime_keys
@man man/man1/mutt.1
@man man/man1/mutt_dotlock.1
@man man/man1/muttbug.1
+@man man/man1/pgpewrap.1
+@man man/man1/pgpring.1
@man man/man1/smime_keys.1
@man man/man5/mbox.5
@man man/man5/mmdf.5
