Attachment #190121 for bug #225497

View | Details | Raw Unified | Return to bug 225497
Collapse All | Expand All

Lines 2-8 Link Here

(-)b/mail/mutt/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	PORTVERSION= 1.9.2	5	PORTVERSION= 1.9.3
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES+= mail ipv6	7	CATEGORIES+= mail ipv6
8	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \	8	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
Lines 203-209 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
203		203
204	# un/comment as each VERSION is created for PORTVERSION	204	# un/comment as each VERSION is created for PORTVERSION
205	VVV_PATCH_VERSION= 1.9.1	205	VVV_PATCH_VERSION= 1.9.1
206	GREETING_PATCH_VERSION= 1.9.1	206	GREETING_PATCH_VERSION= 1.9.2
207		207
208	.if !defined(VVV_PATCH_VERSION)	208	.if !defined(VVV_PATCH_VERSION)
209	VVV_PATCH_VERSION= ${PORTVERSION}	209	VVV_PATCH_VERSION= ${PORTVERSION}

Lines 1-8 Link Here

(-)b/mail/mutt/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1513396241	1	TIMESTAMP = 1517087010
2	SHA256 (mutt/mutt-1.9.2.tar.gz) = a2e152a352bbf02d222d54074199d9c53821c19f700c4cb85f78fa85faed7896	2	SHA256 (mutt/mutt-1.9.3.tar.gz) = 431a85d6933ddf75cae51c9966c17d33e32fb0588cb3bbec9d32e01b267b76e1
3	SIZE (mutt/mutt-1.9.2.tar.gz) = 4195627	3	SIZE (mutt/mutt-1.9.3.tar.gz) = 4196100
4	SHA256 (mutt/mutt-1.9.1.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317	4	SHA256 (mutt/mutt-1.9.2.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
5	SIZE (mutt/mutt-1.9.1.vc.greeting) = 4534	5	SIZE (mutt/mutt-1.9.2.vc.greeting) = 4534
6	SHA256 (mutt/patch-1.9.1.vvv.nntp.gz) = f7098b713dfcbb2a4a6e5edaf536eb99be6d92fad073d5d3ac436b0191c7c892	6	SHA256 (mutt/patch-1.9.1.vvv.nntp.gz) = f7098b713dfcbb2a4a6e5edaf536eb99be6d92fad073d5d3ac436b0191c7c892
7	SIZE (mutt/patch-1.9.1.vvv.nntp.gz) = 60687	7	SIZE (mutt/patch-1.9.1.vvv.nntp.gz) = 60687
8	SHA256 (mutt/patch-1.9.1.vvv.initials.gz) = 4673ca438fb673dfee09c6b8b8f9e8e78af06056f1b515c6030b0533dae847e5	8	SHA256 (mutt/patch-1.9.1.vvv.initials.gz) = 4673ca438fb673dfee09c6b8b8f9e8e78af06056f1b515c6030b0533dae847e5

Lines 1-4 Link Here

(-)b/mail/mutt/files/extra-patch-smartdate (-3 / +3 lines)
1	--- hdrline.c.orig 2017-06-03 23:31:21 UTC	1	--- hdrline.c.orig 2018-01-27 22:22:49 UTC
2	+++ hdrline.c	2	+++ hdrline.c
3	@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP	3	@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOP
4	* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)	4	* %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
Lines 90-96 Link Here
90	static const char *	90	static const char *
91	hdr_format_str (char *dest,	91	hdr_format_str (char *dest,
92	size_t destlen,	92	size_t destlen,
93	@@ -469,7 +552,13 @@ hdr_format_str (char *dest,	93	@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
94		94
95	if (!do_locales)	95	if (!do_locales)
96	setlocale (LC_TIME, "C");	96	setlocale (LC_TIME, "C");
Lines 105-111 Link Here
105	if (!do_locales)	105	if (!do_locales)
106	setlocale (LC_TIME, "");	106	setlocale (LC_TIME, "");
107		107
108	--- mutt.h.orig 2017-05-30 19:27:53 UTC	108	--- mutt.h.orig 2018-01-27 22:22:49 UTC
109	+++ mutt.h	109	+++ mutt.h
110	@@ -134,6 +134,16 @@ typedef enum	110	@@ -134,6 +134,16 @@ typedef enum
111	MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */	111	MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */




--- 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 = $(SMIMEAUX_TARGET)
 @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
 BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
@@ -1353,18 +1353,9 @@ install-exec-hook:
 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
 		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
 	fi

Lines 1-5 Link Here

(-)b/mail/mutt/files/patch-doc_Makefile.in (-4 / +5 lines)
1	Index: doc/Makefile.in	1	--- doc/Makefile.in.orig 2018-01-27 22:36:31 UTC
2	@@ -667,14 +667,7 @@	2	+++ doc/Makefile.in
		3	@@ -664,14 +664,7 @@ install-data-local: makedoc-all instdoc
3	-for f in $(HTML_DOCFILES) ; do \	4	-for f in $(HTML_DOCFILES) ; do \
4	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \	5	$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
5	done	6	done
Lines 14-21 Index: doc/Makefile.in Link Here
14	+ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample	15	+ $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
15		16
16	uninstall-local:	17	uninstall-local:
17	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 pgpewrap.1 pgpring.1; do \	18	for f in mutt.1 mutt_dotlock.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
18	@@ -697,9 +690,7 @@	19	@@ -694,9 +687,7 @@ uninstall-local:
19		20
20	check:	21	check:
21	manual.txt: manual.html	22	manual.txt: manual.html




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
- 

Return to bug 225497

Lines 1-14 Link Here

(-)b/mail/mutt/files/patch-Makefile.in (-4 / +5 lines)
1	Index: Makefile.in	1	--- Makefile.in.orig 2018-01-27 21:26:30 UTC
2	@@ -471,7 +471,7 @@	2	+++ Makefile.in
		3	@@ -471,7 +471,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
3	@BUILD_DOC_TRUE@DOC_SUBDIR = doc	4	@BUILD_DOC_TRUE@DOC_SUBDIR = doc
4	@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap	5	@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
5	@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap	6	@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
6	-SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)	7	-SUBDIRS = m4 po intl $(DOC_SUBDIR) contrib $(IMAP_SUBDIR)
7	+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)	8	+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . $(DOC_SUBDIR)
8	bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)	9	bin_SCRIPTS = $(SMIMEAUX_TARGET)
9	@BUILD_HCACHE_TRUE@HCVERSION = hcversion.h	10	@BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
10	BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)	11	BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
11	@@ -1359,18 +1359,9 @@	12	@@ -1353,18 +1353,9 @@ install-exec-hook:
12	rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \	13	rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
13	ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \	14	ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
14	fi	15	fi

Lines 1-15 Link Here

(-)b/mail/mutt/pkg-plist (-5 lines)
1	bin/flea
2	bin/mutt	1	bin/mutt
3	bin/muttbug
4	@(,mail,2755) bin/mutt_dotlock	2	@(,mail,2755) bin/mutt_dotlock
5	bin/pgpewrap	3	bin/pgpewrap
6	bin/pgpring	4	bin/pgpring
7	bin/smime_keys	5	bin/smime_keys
8	@sample etc/Muttrc.sample	6	@sample etc/Muttrc.sample
9	man/man1/flea.1.gz
10	man/man1/mutt.1.gz	7	man/man1/mutt.1.gz
11	man/man1/mutt_dotlock.1.gz	8	man/man1/mutt_dotlock.1.gz
12	man/man1/muttbug.1.gz
13	man/man1/pgpewrap.1.gz	9	man/man1/pgpewrap.1.gz
14	man/man1/pgpring.1.gz	10	man/man1/pgpring.1.gz
15	man/man1/smime_keys.1.gz	11	man/man1/smime_keys.1.gz
16	-