[Midnightbsd-cvs] mports [23062] trunk/mail/mutt: update mutt
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Mar 6 08:11:18 EST 2018
Revision: 23062
http://svnweb.midnightbsd.org/mports/?rev=23062
Author: laffer1
Date: 2018-03-06 08:11:17 -0500 (Tue, 06 Mar 2018)
Log Message:
-----------
update mutt
Modified Paths:
--------------
trunk/mail/mutt/Makefile
trunk/mail/mutt/distinfo
trunk/mail/mutt/files/extra-patch-smartdate
trunk/mail/mutt/files/patch-Makefile.in
trunk/mail/mutt/files/patch-doc_Makefile.in
trunk/mail/mutt/pkg-plist
Modified: trunk/mail/mutt/Makefile
===================================================================
--- trunk/mail/mutt/Makefile 2018-03-06 13:03:41 UTC (rev 23061)
+++ trunk/mail/mutt/Makefile 2018-03-06 13:11:17 UTC (rev 23062)
@@ -3,8 +3,8 @@
# $MidnightBSD$
PORTNAME= mutt
-PORTVERSION= 1.9.1
-PORTREVISION?= 1
+PORTVERSION= 1.9.3
+PORTREVISION?= 0
CATEGORIES+= mail ipv6
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -18,10 +18,8 @@
PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
- https://github.com/aschrab/mutt/compare/dev-base...feature/:ats \
http://vc.org.ua/mutt/:vc
PATCH_DIST_STRIP= -p1
-PATCHFILES= date-conditional.diff:ats
MAINTAINER?= ports at MidnightBSD.org
COMMENT?= Small but powerful text based program for read/writing e-mail
@@ -114,9 +112,7 @@
PKGNAMESUFFIX= -lite
USES+= ncurses
PLIST_SUB+= MAILBOX_MANPAGES=""
-PLIST_SUB+= COMPRESSED_FOLDERS="@comment "
PLIST_SUB+= HTML="@comment "
-PLIST_SUB+= XML="@comment "
PLIST_SUB+= NNTP="@comment "
# XXX bug in bpm ?
PLIST_SUB+= NLS="@comment "
@@ -207,8 +203,8 @@
.include <bsd.mport.options.mk>
# un/comment as each VERSION is created for PORTVERSION
-#VVV_PATCH_VERSION= 1.8.3
-GREETING_PATCH_VERSION= 1.9.0
+VVV_PATCH_VERSION= 1.9.1
+GREETING_PATCH_VERSION= 1.9.2
.if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION= ${PORTVERSION}
Modified: trunk/mail/mutt/distinfo
===================================================================
--- trunk/mail/mutt/distinfo 2018-03-06 13:03:41 UTC (rev 23061)
+++ trunk/mail/mutt/distinfo 2018-03-06 13:11:17 UTC (rev 23062)
@@ -1,10 +1,8 @@
-TIMESTAMP = 1506285098
-SHA256 (mutt/mutt-1.9.1.tar.gz) = 749b83a96373c6e2101ebe8c4b9a651735e02c478edb750750a5146a15d91bb1
-SIZE (mutt/mutt-1.9.1.tar.gz) = 4193868
-SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e
-SIZE (mutt/date-conditional.diff) = 2023
-SHA256 (mutt/mutt-1.9.0.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
-SIZE (mutt/mutt-1.9.0.vc.greeting) = 4534
+TIMESTAMP = 1517087010
+SHA256 (mutt/mutt-1.9.3.tar.gz) = 431a85d6933ddf75cae51c9966c17d33e32fb0588cb3bbec9d32e01b267b76e1
+SIZE (mutt/mutt-1.9.3.tar.gz) = 4196100
+SHA256 (mutt/mutt-1.9.2.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
+SIZE (mutt/mutt-1.9.2.vc.greeting) = 4534
SHA256 (mutt/patch-1.9.1.vvv.nntp.gz) = f7098b713dfcbb2a4a6e5edaf536eb99be6d92fad073d5d3ac436b0191c7c892
SIZE (mutt/patch-1.9.1.vvv.nntp.gz) = 60687
SHA256 (mutt/patch-1.9.1.vvv.initials.gz) = 4673ca438fb673dfee09c6b8b8f9e8e78af06056f1b515c6030b0533dae847e5
Modified: trunk/mail/mutt/files/extra-patch-smartdate
===================================================================
--- trunk/mail/mutt/files/extra-patch-smartdate 2018-03-06 13:03:41 UTC (rev 23061)
+++ trunk/mail/mutt/files/extra-patch-smartdate 2018-03-06 13:11:17 UTC (rev 23062)
@@ -1,4 +1,4 @@
---- hdrline.c.orig 2017-06-03 23:31:21 UTC
+--- hdrline.c.orig 2018-01-27 22:22:49 UTC
+++ hdrline.c
@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
@@ -90,7 +90,7 @@
static const char *
hdr_format_str (char *dest,
size_t destlen,
-@@ -469,7 +552,13 @@ hdr_format_str (char *dest,
+@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
if (!do_locales)
setlocale (LC_TIME, "C");
@@ -105,7 +105,7 @@
if (!do_locales)
setlocale (LC_TIME, "");
---- mutt.h.orig 2017-05-30 19:27:53 UTC
+--- mutt.h.orig 2018-01-27 22:22:49 UTC
+++ mutt.h
@@ -134,6 +134,16 @@ typedef enum
MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */
Modified: trunk/mail/mutt/files/patch-Makefile.in
===================================================================
--- trunk/mail/mutt/files/patch-Makefile.in 2018-03-06 13:03:41 UTC (rev 23061)
+++ trunk/mail/mutt/files/patch-Makefile.in 2018-03-06 13:11:17 UTC (rev 23062)
@@ -1,14 +1,15 @@
-Index: Makefile.in
-@@ -471,7 +471,7 @@
+--- Makefile.in.orig 2018-01-27 21:26:30 UTC
++++ Makefile.in
+@@ -471,7 +471,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
@BUILD_DOC_TRUE at DOC_SUBDIR = doc
@BUILD_IMAP_TRUE at IMAP_SUBDIR = imap
@BUILD_IMAP_TRUE at IMAP_INCLUDES = -I$(top_srcdir)/imap
-SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)
- bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
+ bin_SCRIPTS = $(SMIMEAUX_TARGET)
@BUILD_HCACHE_TRUE at HCVERSION = hcversion.h
BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
-@@ -1359,18 +1359,9 @@
+@@ -1353,18 +1353,9 @@ install-exec-hook:
rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
fi
Modified: trunk/mail/mutt/files/patch-doc_Makefile.in
===================================================================
--- trunk/mail/mutt/files/patch-doc_Makefile.in 2018-03-06 13:03:41 UTC (rev 23061)
+++ trunk/mail/mutt/files/patch-doc_Makefile.in 2018-03-06 13:11:17 UTC (rev 23062)
@@ -1,5 +1,6 @@
-Index: doc/Makefile.in
-@@ -667,14 +667,7 @@
+--- doc/Makefile.in.orig 2018-01-27 22:36:31 UTC
++++ doc/Makefile.in
+@@ -664,14 +664,7 @@ install-data-local: makedoc-all instdoc
-for f in $(HTML_DOCFILES) ; do \
$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
done
@@ -14,8 +15,8 @@
+ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
uninstall-local:
- for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
-@@ -697,9 +690,7 @@
+ for f in mutt.1 mutt_dotlock.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
+@@ -694,9 +687,7 @@ uninstall-local:
check:
manual.txt: manual.html
Modified: trunk/mail/mutt/pkg-plist
===================================================================
--- trunk/mail/mutt/pkg-plist 2018-03-06 13:03:41 UTC (rev 23061)
+++ trunk/mail/mutt/pkg-plist 2018-03-06 13:11:17 UTC (rev 23062)
@@ -1,15 +1,11 @@
-bin/flea
bin/mutt
-bin/muttbug
@(,mail,2755) bin/mutt_dotlock
bin/pgpewrap
bin/pgpring
bin/smime_keys
@sample etc/Muttrc.sample
-man/man1/flea.1.gz
man/man1/mutt.1.gz
man/man1/mutt_dotlock.1.gz
-man/man1/muttbug.1.gz
man/man1/pgpewrap.1.gz
man/man1/pgpring.1.gz
man/man1/smime_keys.1.gz
More information about the Midnightbsd-cvs
mailing list