diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mutt/Makefile | 4 | ||||
| -rw-r--r-- | mail/mutt/distinfo | 10 | ||||
| -rw-r--r-- | mail/mutt/files/extra-patch-smartdate | 6 | ||||
| -rw-r--r-- | mail/mutt/files/patch-Makefile.in | 9 | ||||
| -rw-r--r-- | mail/mutt/files/patch-doc_Makefile.in | 9 | ||||
| -rw-r--r-- | mail/mutt/pkg-plist | 4 |
6 files changed, 20 insertions, 22 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 7092ada63e2f..3f0a95233b62 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mutt -PORTVERSION= 1.9.2 +PORTVERSION= 1.9.3 PORTREVISION?= 0 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ @@ -203,7 +203,7 @@ DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref # un/comment as each VERSION is created for PORTVERSION VVV_PATCH_VERSION= 1.9.1 -GREETING_PATCH_VERSION= 1.9.1 +GREETING_PATCH_VERSION= 1.9.2 .if !defined(VVV_PATCH_VERSION) VVV_PATCH_VERSION= ${PORTVERSION} diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index ecb41ea828a1..e4154595e440 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1513396241 -SHA256 (mutt/mutt-1.9.2.tar.gz) = a2e152a352bbf02d222d54074199d9c53821c19f700c4cb85f78fa85faed7896 -SIZE (mutt/mutt-1.9.2.tar.gz) = 4195627 -SHA256 (mutt/mutt-1.9.1.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317 -SIZE (mutt/mutt-1.9.1.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 diff --git a/mail/mutt/files/extra-patch-smartdate b/mail/mutt/files/extra-patch-smartdate index 1e8e839946a6..cf5f140e3c93 100644 --- a/mail/mutt/files/extra-patch-smartdate +++ b/mail/mutt/files/extra-patch-smartdate @@ -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 */ diff --git a/mail/mutt/files/patch-Makefile.in b/mail/mutt/files/patch-Makefile.in index 1a75ec2f6e3c..9bc6f8f2ce0a 100644 --- a/mail/mutt/files/patch-Makefile.in +++ b/mail/mutt/files/patch-Makefile.in @@ -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@DOC_SUBDIR = doc @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap @BUILD_IMAP_TRUE@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@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 diff --git a/mail/mutt/files/patch-doc_Makefile.in b/mail/mutt/files/patch-doc_Makefile.in index a8f7e7b09434..aa566f24aeaf 100644 --- a/mail/mutt/files/patch-doc_Makefile.in +++ b/mail/mutt/files/patch-doc_Makefile.in @@ -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 @@ Index: doc/Makefile.in + $(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 diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist index eb1aebb47d3c..161ea4bd5ca7 100644 --- a/mail/mutt/pkg-plist +++ b/mail/mutt/pkg-plist @@ -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 |