sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mail/mutt: Update to 1.9.3

Browse source 
PR:		225497
Submitted by:	dereks@lifeofadishwasher.com (maintainer)
This commit is contained in:
Steve Wills 2018-02-03 05:01:00 +00:00
parent 3d8606b2a6
commit 7f46477597
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=460775
6 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mail/mutt/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= mutt PORTNAME= mutt
PORTVERSION= 1.9.2 PORTVERSION= 1.9.3
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES+= mail ipv6 CATEGORIES+= mail ipv6
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ 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 # un/comment as each VERSION is created for PORTVERSION
VVV_PATCH_VERSION= 1.9.1 VVV_PATCH_VERSION= 1.9.1
GREETING_PATCH_VERSION= 1.9.1 GREETING_PATCH_VERSION= 1.9.2
.if !defined(VVV_PATCH_VERSION) .if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION= ${PORTVERSION} VVV_PATCH_VERSION= ${PORTVERSION}

10
mail/mutt/distinfo
View file

@ -1,8 +1,8 @@
TIMESTAMP = 1513396241 TIMESTAMP = 1517087010
SHA256 (mutt/mutt-1.9.2.tar.gz) = a2e152a352bbf02d222d54074199d9c53821c19f700c4cb85f78fa85faed7896 SHA256 (mutt/mutt-1.9.3.tar.gz) = 431a85d6933ddf75cae51c9966c17d33e32fb0588cb3bbec9d32e01b267b76e1
SIZE (mutt/mutt-1.9.2.tar.gz) = 4195627 SIZE (mutt/mutt-1.9.3.tar.gz) = 4196100
SHA256 (mutt/mutt-1.9.1.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317 SHA256 (mutt/mutt-1.9.2.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
SIZE (mutt/mutt-1.9.1.vc.greeting) = 4534 SIZE (mutt/mutt-1.9.2.vc.greeting) = 4534
SHA256 (mutt/patch-1.9.1.vvv.nntp.gz) = f7098b713dfcbb2a4a6e5edaf536eb99be6d92fad073d5d3ac436b0191c7c892 SHA256 (mutt/patch-1.9.1.vvv.nntp.gz) = f7098b713dfcbb2a4a6e5edaf536eb99be6d92fad073d5d3ac436b0191c7c892
SIZE (mutt/patch-1.9.1.vvv.nntp.gz) = 60687 SIZE (mutt/patch-1.9.1.vvv.nntp.gz) = 60687
SHA256 (mutt/patch-1.9.1.vvv.initials.gz) = 4673ca438fb673dfee09c6b8b8f9e8e78af06056f1b515c6030b0533dae847e5 SHA256 (mutt/patch-1.9.1.vvv.initials.gz) = 4673ca438fb673dfee09c6b8b8f9e8e78af06056f1b515c6030b0533dae847e5

6
mail/mutt/files/extra-patch-smartdate
View file

@ -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 +++ hdrline.c
@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP @@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label) * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
@ -90,7 +90,7 @@
static const char * static const char *
hdr_format_str (char *dest, hdr_format_str (char *dest,
size_t destlen, size_t destlen,
@@ -469,7 +552,13 @@ hdr_format_str (char *dest, @@ -422,7 +505,13 @@ hdr_format_str (char *dest,
if (!do_locales) if (!do_locales)
setlocale (LC_TIME, "C"); setlocale (LC_TIME, "C");
@ -105,7 +105,7 @@
if (!do_locales) if (!do_locales)
setlocale (LC_TIME, ""); 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 +++ mutt.h
@@ -134,6 +134,16 @@ typedef enum @@ -134,6 +134,16 @@ typedef enum
MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */ MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */

9
mail/mutt/files/patch-Makefile.in
View file

@ -1,14 +1,15 @@
Index: Makefile.in --- Makefile.in.orig 2018-01-27 21:26:30 UTC
@@ -471,7 +471,7 @@ +++ Makefile.in
@@ -471,7 +471,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
@BUILD_DOC_TRUE@DOC_SUBDIR = doc @BUILD_DOC_TRUE@DOC_SUBDIR = doc
@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
-SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR) -SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_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 @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION) 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 ; \ rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
fi fi

9
mail/mutt/files/patch-doc_Makefile.in
View file

@ -1,5 +1,6 @@
Index: doc/Makefile.in --- doc/Makefile.in.orig 2018-01-27 22:36:31 UTC
@@ -667,14 +667,7 @@ +++ doc/Makefile.in
@@ -664,14 +664,7 @@ install-data-local: makedoc-all instdoc
-for f in $(HTML_DOCFILES) ; do \ -for f in $(HTML_DOCFILES) ; do \
$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \ $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
done done
@ -14,8 +15,8 @@ Index: doc/Makefile.in
+ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample + $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
uninstall-local: uninstall-local:
for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \ for f in mutt.1 mutt_dotlock.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
@@ -697,9 +690,7 @@ @@ -694,9 +687,7 @@ uninstall-local:
check: check:
manual.txt: manual.html manual.txt: manual.html

4
mail/mutt/pkg-plist
View file

@ -1,15 +1,11 @@
bin/flea
bin/mutt bin/mutt
bin/muttbug
@(,mail,2755) bin/mutt_dotlock @(,mail,2755) bin/mutt_dotlock
bin/pgpewrap bin/pgpewrap
bin/pgpring bin/pgpring
bin/smime_keys bin/smime_keys
@sample etc/Muttrc.sample @sample etc/Muttrc.sample
man/man1/flea.1.gz
man/man1/mutt.1.gz man/man1/mutt.1.gz
man/man1/mutt_dotlock.1.gz man/man1/mutt_dotlock.1.gz
man/man1/muttbug.1.gz
man/man1/pgpewrap.1.gz man/man1/pgpewrap.1.gz
man/man1/pgpring.1.gz man/man1/pgpring.1.gz
man/man1/smime_keys.1.gz man/man1/smime_keys.1.gz