diff -r -u -N mail/mutt/Makefile ../../home/pi/myp/mail/mutt/Makefile --- mail/mutt/Makefile 2016-04-01 17:11:32.672053000 +0200 +++ ../../home/pi/myp/mail/mutt/Makefile 2016-04-08 20:18:32.194456000 +0200 @@ -2,8 +2,7 @@ # $FreeBSD: head/mail/mutt/Makefile 412348 2016-04-01 14:16:16Z mat $ PORTNAME= mutt -PORTVERSION= 1.5.24 -PORTREVISION?= 6 +PORTVERSION= 1.6.0 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ @@ -40,6 +39,8 @@ CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} .endif +#USES+= autoreconf +#GNU_CONFIGURE= yes USE_AUTOTOOLS= automake autoconf AUTOMAKE_ARGS= --add-missing --foreign USE_OPENSSL= yes diff -r -u -N mail/mutt/distinfo ../../home/pi/myp/mail/mutt/distinfo --- mail/mutt/distinfo 2015-09-14 16:58:04.193616000 +0200 +++ ../../home/pi/myp/mail/mutt/distinfo 2016-04-08 18:53:20.516957000 +0200 @@ -1,12 +1,8 @@ -SHA256 (mutt/mutt-1.5.24.tar.gz) = a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 -SIZE (mutt/mutt-1.5.24.tar.gz) = 3897115 -SHA256 (mutt/patch-1.5.24.rr.compressed.gz) = c5eb9b53f7bd3feaa5ee03722575f64e43512b756c099ffe20db6fe5c958e3dc -SIZE (mutt/patch-1.5.24.rr.compressed.gz) = 10019 -SHA256 (mutt/patch-1.5.24.vvv.nntp.gz) = d34be4542d549aab6de9f7038c88b3eeefe826db643c92b27e1e65ab5f7d573e -SIZE (mutt/patch-1.5.24.vvv.nntp.gz) = 61359 -SHA256 (mutt/patch-1.5.24.vvv.nntp_ru.gz) = 70436af316aefd0d31aa33e127df49da4bdd1b4a8b3fbec73b3fca5428f3ab0e -SIZE (mutt/patch-1.5.24.vvv.nntp_ru.gz) = 5719 -SHA256 (mutt/patch-1.5.24.vvv.initials.gz) = 6522d12d34c0be71531465e05010413a0f2907d597e9fb5100a65d18093f0599 -SIZE (mutt/patch-1.5.24.vvv.initials.gz) = 671 -SHA256 (mutt/patch-1.5.24.vvv.quote.gz) = fa161302179bbc646a83d7029381f828bece5b177e940f2fca6d5769633b9f0a -SIZE (mutt/patch-1.5.24.vvv.quote.gz) = 1254 +SHA256 (mutt/mutt-1.6.0.tar.gz) = 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 +SIZE (mutt/mutt-1.6.0.tar.gz) = 3954591 +SHA256 (mutt/patch-1.6.0.rr.compressed.gz) = c57ad6b19b2dbd812c27a098273b68b2d3b45ce2d36c3a4bff3493ad2cb75b85 +SIZE (mutt/patch-1.6.0.rr.compressed.gz) = 9977 +SHA256 (mutt/patch-1.6.0.vvv.initials.gz) = f1923f35cd5a400930d6aa6a60f213bf7b8b0f65e6a0d856e7ef23914e822f4d +SIZE (mutt/patch-1.6.0.vvv.initials.gz) = 668 +SHA256 (mutt/patch-1.6.0.vvv.quote.gz) = 362b9462b2e45de36c962450e9b6715e7f4c00fb5dce4c041fd6c675fbb73814 +SIZE (mutt/patch-1.6.0.vvv.quote.gz) = 1252 diff -r -u -N mail/mutt/files/extra-patch-trash-purge ../../home/pi/myp/mail/mutt/files/extra-patch-trash-purge --- mail/mutt/files/extra-patch-trash-purge 2015-09-14 16:58:04.242643000 +0200 +++ ../../home/pi/myp/mail/mutt/files/extra-patch-trash-purge 2016-04-08 20:17:28.899350000 +0200 @@ -336,22 +336,6 @@ diff -pruN -x'*.orig' mutt-1.5.20/pager.c mutt-1.5.20-trash/pager.c --- mutt-1.5.20/pager.c 2009-06-03 16:48:31.000000000 -0400 +++ mutt-1.5.20-trash/pager.c 2009-07-23 09:44:40.000000000 -0400 -@@ -2309,12 +2309,15 @@ search_next: - MAYBE_REDRAW (redraw); - break; - -+ case OP_PURGE_MESSAGE: - case OP_DELETE: - CHECK_MODE(IsHeader (extra)); - CHECK_READONLY; - CHECK_ACL(M_ACL_DELETE, _("delete message")); - - mutt_set_flag (Context, extra->hdr, M_DELETE, 1); -+ mutt_set_flag (Context, extra->hdr, M_PURGED, -+ ch != OP_PURGE_MESSAGE ? 0 : 1); - if (option (OPTDELETEUNTAG)) - mutt_set_flag (Context, extra->hdr, M_TAG, 0); - redraw = REDRAW_STATUS | REDRAW_INDEX; @@ -2641,6 +2644,7 @@ search_next: CHECK_ACL(M_ACL_DELETE, _("undelete message")); diff -r -u -N mail/mutt/files/patch-examples ../../home/pi/myp/mail/mutt/files/patch-examples --- mail/mutt/files/patch-examples 2015-09-14 16:58:04.241611000 +0200 +++ ../../home/pi/myp/mail/mutt/files/patch-examples 2016-04-08 20:13:38.235790000 +0200 @@ -70,17 +70,6 @@ /usr/local/etc. --- doc/manual.txt.orig 2015-08-30 19:25:51.000000000 +0200 +++ doc/manual.txt 2015-09-10 08:56:32.000000000 +0200 -@@ -3128,8 +3128,8 @@ - argument. - - A practical example is the mutt_xtitle script installed in the samples -- subdirectory of the Mutt documentation: it can be used as filter for -- $$ssttaattuuss__ffoorrmmaatt to set the current terminal's title, if supported. -+ share/examples/mutt subdirectory of the Mutt documentation: it can be used as -+ filter for $$ssttaattuuss__ffoorrmmaatt to set the current terminal's title, if supported. - - 29.4. Padding - @@ -7736,8 +7736,8 @@ For examples on how to configure these formats for the various versions